diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 5f194d8d..56a5a7c7 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -69,9 +69,9 @@ e2fsprogs: $(E2FSPROGS_DEPENDENCIES) $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DI
 # -----------------------------------------------------------------------------
 
 HOST_E2FSPROGS_VERSION = $(E2FSPROGS_VERSION)
-HOST_E2FSPROGS_DIR = e2fsprogs-$(HOST_E2FSPROGS_VERSION)
-HOST_E2FSPROGS_SOURCE = e2fsprogs-$(HOST_E2FSPROGS_VERSION).tar.gz
-HOST_E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(HOST_E2FSPROGS_VERSION)
+HOST_E2FSPROGS_DIR = $(E2FSPROGS_DIR)
+HOST_E2FSPROGS_SOURCE = $(E2FSPROGS_SOURCE)
+HOST_E2FSPROGS_SITE = $(E2FSPROGS_SITE)
 
 #$(DL_DIR)/$(HOST_E2FSPROGS_SOURCE):
 #	$(download) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE)
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index 4f22106c..ba5d5f44 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -4,10 +4,17 @@
 #
 ################################################################################
 
-HOST_LUAROCKS_VERSION = 3.9.0
-HOST_LUAROCKS_DIR = luarocks-$(HOST_LUAROCKS_VERSION)
-HOST_LUAROCKS_SOURCE = luarocks-$(HOST_LUAROCKS_VERSION).tar.gz
-HOST_LUAROCKS_SITE = https://luarocks.github.io/luarocks/releases
+LUAROCKS_VERSION = 3.9.0
+LUAROCKS_DIR = luarocks-$(LUAROCKS_VERSION)
+LUAROCKS_SOURCE = luarocks-$(LUAROCKS_VERSION).tar.gz
+LUAROCKS_SITE = https://luarocks.github.io/luarocks/releases
+
+# ------------------------------------------------------------------------------
+
+HOST_LUAROCKS_VERSION = $(LUAROCKS_VERSION)
+HOST_LUAROCKS_DIR = $(LUAROCKS_DIR)
+HOST_LUAROCKS_SOURCE = $(LUAROCKS_SOURCE)
+HOST_LUAROCKS_SITE = $(LUAROCKS_SITE)
 
 HOST_LUAROCKS_DEPENDENCIES = host-lua
 
diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk
index 9a3cee7f..2a5b72d8 100644
--- a/package/mtools/mtools.mk
+++ b/package/mtools/mtools.mk
@@ -4,10 +4,17 @@
 #
 ################################################################################
 
-HOST_MTOOLS_VERSION = 4.0.39
-HOST_MTOOLS_DIR = mtools-$(HOST_MTOOLS_VERSION)
-HOST_MTOOLS_SOURCE = mtools-$(HOST_MTOOLS_VERSION).tar.gz
-HOST_MTOOLS_SITE = $(GNU_MIRROR)/mtools
+MTOOLS_VERSION = 4.0.39
+MTOOLS_DIR = mtools-$(MTOOLS_VERSION)
+MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.gz
+MTOOLS_SITE = $(GNU_MIRROR)/mtools
+
+# ------------------------------------------------------------------------------
+
+HOST_MTOOLS_VERSION = $(MTOOLS_VERSION)
+HOST_MTOOLS_DIR = $(MTOOLS_DIR)
+HOST_MTOOLS_SOURCE = $(MTOOLS_SOURCE)
+HOST_MTOOLS_SITE = $(MTOOLS_SITE)
 
 host-mtools: | $(HOST_DIR)
 	$(call PREPARE)
diff --git a/package/u-boot/u-boot.mk b/package/u-boot/u-boot.mk
index 04527670..c55cca45 100644
--- a/package/u-boot/u-boot.mk
+++ b/package/u-boot/u-boot.mk
@@ -4,10 +4,17 @@
 #
 ################################################################################
 
-HOST_U_BOOT_VERSION = 2021.04
-HOST_U_BOOT_DIR = u-boot-$(HOST_U_BOOT_VERSION)
-HOST_U_BOOT_SOURCE = u-boot-$(HOST_U_BOOT_VERSION).tar.bz2
-HOST_U_BOOT_SITE = ftp://ftp.denx.de/pub/u-boot
+U_BOOT_VERSION = 2021.04
+U_BOOT_DIR = u-boot-$(U_BOOT_VERSION)
+U_BOOT_SOURCE = u-boot-$(U_BOOT_VERSION).tar.bz2
+U_BOOT_SITE = ftp://ftp.denx.de/pub/u-boot
+
+# ------------------------------------------------------------------------------
+
+HOST_U_BOOT_VERSION = $(U_BOOT_VERSION)
+HOST_U_BOOT_DIR = $(U_BOOT_DIR)
+HOST_U_BOOT_SOURCE = $(U_BOOT_SOURCE)
+HOST_U_BOOT_SITE = $(U_BOOT_SITE)
 
 HOST_MKIMAGE = $(HOST_DIR)/bin/mkimage
 
diff --git a/package/zic/zic.mk b/package/zic/zic.mk
index 14af4d56..b272587e 100644
--- a/package/zic/zic.mk
+++ b/package/zic/zic.mk
@@ -4,10 +4,17 @@
 #
 ################################################################################
 
-HOST_ZIC_VERSION = 2022a
-HOST_ZIC_DIR = tzcode$(HOST_ZIC_VERSION)
-HOST_ZIC_SOURCE = tzcode$(HOST_ZIC_VERSION).tar.gz
-HOST_ZIC_SITE = https://data.iana.org/time-zones/releases
+ZIC_VERSION = 2022a
+ZIC_DIR = tzcode$(ZIC_VERSION)
+ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz
+ZIC_SITE = https://data.iana.org/time-zones/releases
+
+# ------------------------------------------------------------------------------
+
+HOST_ZIC_VERSION = $(ZIC_VERSION)
+HOST_ZIC_DIR = $(ZIC_DIR)
+HOST_ZIC_SOURCE = $(ZIC_SOURCE)
+HOST_ZIC_SITE = $(ZIC_SITE)
 
 HOST_ZIC = $(HOST_DIR)/sbin/zic