diff --git a/archive-patches/libglib2-disable-tests.patch b/archive-patches/glib2-disable-tests.patch
similarity index 100%
rename from archive-patches/libglib2-disable-tests.patch
rename to archive-patches/glib2-disable-tests.patch
diff --git a/make/archives.mk b/make/archives.mk
index f2aa8ba9..9edeb477 100644
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -3,38 +3,10 @@
 #
 # -----------------------------------------------------------------------------
 
-LIBGCRYPT_VER=1.8.3
-$(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz:
-	$(WGET) ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(LIBGCRYPT_VER).tar.gz
-
-LIBGPG-ERROR_VER=1.32
-$(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2:
-	$(WGET) ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2
-
 TZDATA_VER=2018e
 $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz:
 	$(WGET) ftp://ftp.iana.org/tz/releases/tzdata$(TZDATA_VER).tar.gz
 
-PUGIXML_VER=1.9
-$(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz:
-	$(WGET) http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VER)/pugixml-$(PUGIXML_VER).tar.gz
-
-LIBXML2_VER=2.9.8
-$(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz:
-	$(WGET) ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VER).tar.gz
-
-NFS-UTILS_VER=2.2.1
-$(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2:
-	$(WGET) http://sourceforge.net/projects/nfs/files/nfs-utils/$(NFS-UTILS_VER)/nfs-utils-$(NFS-UTILS_VER).tar.bz2
-
-RPCBIND_VER=1.2.5
-$(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2:
-	$(WGET) http://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VER)/rpcbind-$(RPCBIND_VER).tar.bz2
-
-LIBTIRPC_VER=1.0.2
-$(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2:
-	$(WGET) http://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VER)/libtirpc-$(LIBTIRPC_VER).tar.bz2
-
 MTD-UTILS_VER=2.0.2
 $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2:
 	$(WGET) ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-$(MTD-UTILS_VER).tar.bz2
@@ -190,14 +162,6 @@ PROCPS-NG_VER=3.3.15
 $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz:
 	$(WGET) http://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$(PROCPS-NG_VER).tar.xz
 
-BUSYBOX_MAJOR=1
-BUSYBOX_MINOR=30
-BUSYBOX_MICRO=1
-BUSYBOX_VER=$(BUSYBOX_MAJOR).$(BUSYBOX_MINOR).$(BUSYBOX_MICRO)
-BUSYBOX_SOURCE=busybox-$(BUSYBOX_VER).tar.bz2
-$(ARCHIVE)/$(BUSYBOX_SOURCE):
-	$(WGET) http://busybox.net/downloads/$(BUSYBOX_SOURCE)
-
 SAMBA33_VER=3.3.16
 $(ARCHIVE)/samba-$(SAMBA33_VER).tar.gz:
 	$(WGET) https://download.samba.org/pub/samba/samba-$(SAMBA33_VER).tar.gz
@@ -214,23 +178,6 @@ endif
 $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz:
 	$(WGET) http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VER)/e2fsprogs-$(E2FSPROGS_VER).tar.gz
 
-SMARTMON_VER=6.6
-$(ARCHIVE)/smartmontools-$(SMARTMON_VER).tar.gz:
-	$(WGET) http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMON_VER)/smartmontools-$(SMARTMON_VER).tar.gz
-
-NANO_VER_MAJOR=3
-NANO_VER=$(NANO_VER_MAJOR).1
-$(ARCHIVE)/nano-$(NANO_VER).tar.gz:
-	$(WGET) http://www.nano-editor.org/dist/v$(NANO_VER_MAJOR)/nano-$(NANO_VER).tar.gz
-
-MINICOM_VER=2.7.1
-$(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz:
-	$(WGET) http://fossies.org/linux/misc/minicom-$(MINICOM_VER).tar.gz
-
-LZO_VER=2.10
-$(ARCHIVE)/lzo-$(LZO_VER).tar.gz:
-	$(WGET) https://fossies.org/linux/misc/lzo-$(LZO_VER).tar.gz
-
 GNULIB_VER=20140202
 $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz:
 	$(WGET) http://erislabs.net/ianb/projects/gnulib/gnulib-$(GNULIB_VER)-stable.tar.gz
@@ -239,13 +186,6 @@ SLINGSHOT_VER=6
 $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz:
 	$(WGET) https://github.com/gvvaughan/slingshot/archive/v$(SLINGSHOT_VER).tar.gz
 
-LIBSIGCPP_MAJOR=2
-LIBSIGCPP_MINOR=4
-LIBSIGCPP_MICRO=1
-LIBSIGCPP_VER=$(LIBSIGCPP_MAJOR).$(LIBSIGCPP_MINOR).$(LIBSIGCPP_MICRO)
-$(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz:
-	$(WGET) http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGCPP_MAJOR).$(LIBSIGCPP_MINOR)/libsigc++-$(LIBSIGCPP_VER).tar.xz
-
 LUA_ABIVER=5.2
 LUA_VER=$(LUA_ABIVER).4
 $(ARCHIVE)/lua-$(LUA_VER).tar.gz:
@@ -283,91 +223,10 @@ LIBAACS_VER=0.9.0
 $(ARCHIVE)/libaacs-$(LIBAACS_VER).tar.bz2:
 	$(WGET) ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VER)/libaacs-$(LIBAACS_VER).tar.bz2
 
-BASH_MAJOR=5
-BASH_MINOR=0
-BASH_MICRO=0
-BASH_VER=$(BASH_MAJOR).$(BASH_MINOR)
-ifneq ($(BASH_MICRO), 0)
-  BASH_VER=$(BASH_VER).$(BASH_MICRO)
-endif
-$(ARCHIVE)/bash-$(BASH_VER).tar.gz:
-	$(WGET) http://ftp.gnu.org/gnu/bash/bash-$(BASH_VER).tar.gz
-
-CORTEX-STRINGS_VER=48fd30c346ff2ab14ca574b770b5c1bcbefadba8
-$(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2:
-	get-git-archive.sh http://git.linaro.org/git-ro/toolchain/cortex-strings.git $(CORTEX-STRINGS_VER) $(notdir $@) $(ARCHIVE)
-
-DOSFSTOOLS_VER=4.1
-$(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz:
-	$(WGET) https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VER)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
-
-LESS_VER=530
-$(ARCHIVE)/less-$(LESS_VER).tar.gz:
-	$(WGET) http://www.greenwoodsoftware.com/less/less-$(LESS_VER).tar.gz
-
 CONFUSE_VER=3.2.2
 $(ARCHIVE)/confuse-$(CONFUSE_VER).tar.xz:
 	$(WGET) https://github.com/martinh/libconfuse/releases/download/v$(CONFUSE_VER)/confuse-$(CONFUSE_VER).tar.xz
 
-ITE_VER=2.0.2
-$(ARCHIVE)/libite-$(ITE_VER).tar.xz:
-	$(WGET) https://github.com/troglobit/libite/releases/download/v$(ITE_VER)/libite-$(ITE_VER).tar.xz
-
 FUSE_EXFAT_VER=1.2.8
 $(ARCHIVE)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz:
 	$(WGET) https://github.com/relan/exfat/releases/download/v$(FUSE_EXFAT_VER)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz
-
-EXFAT_UTILS_VER=1.2.8
-$(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz:
-	$(WGET) https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VER)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz
-
-FRIBIDI_VER = 1.0.4
-$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
-	$(WGET) https://download.videolan.org/contrib/fribidi/fribidi-$(FRIBIDI_VER).tar.bz2
-
-MC_VER=4.8.22
-$(ARCHIVE)/mc-$(MC_VER).tar.xz:
-	$(WGET) http://ftp.midnight-commander.org/mc-$(MC_VER).tar.xz
-
-LIBFFI_VER=3.2.1
-$(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz:
-	$(WGET) ftp://sourceware.org/pub/libffi/libffi-$(LIBFFI_VER).tar.gz
-
-GLIB_MAJOR=2
-GLIB_MINOR=56
-GLIB_MICRO=3
-GLIB_VER=$(GLIB_MAJOR).$(GLIB_MINOR).$(GLIB_MICRO)
-$(ARCHIVE)/glib-$(GLIB_VER).tar.xz:
-	$(WGET) http://ftp.gnome.org/pub/gnome/sources/glib/$(GLIB_MAJOR).$(GLIB_MINOR)/glib-$(GLIB_VER).tar.xz
-
-GETTEXT_VERSION=0.19.8.1
-$(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz:
-	$(WGET) ftp://ftp.gnu.org/gnu/gettext/gettext-$(GETTEXT_VERSION).tar.xz
-
-WGET_VER=1.19.2
-$(ARCHIVE)/wget-$(WGET_VER).tar.gz:
-	$(WGET) http://ftp.gnu.org/gnu/wget/wget-$(WGET_VER).tar.gz
-
-ALSA-LIB_VER = 1.1.8
-ALSA-LIB_SOURCE = alsa-lib-$(ALSA-LIB_VER).tar.bz2
-$(ARCHIVE)/$(ALSA-LIB_SOURCE):
-	$(WGET) ftp://ftp.alsa-project.org/pub/lib/$(ALSA-LIB_SOURCE)
-
-ETHTOOL_VER = 4.19
-ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VER).tar.xz
-$(ARCHIVE)/$(ETHTOOL_SOURCE):
-	$(WGET) https://www.kernel.org/pub/software/network/ethtool/$(ETHTOOL_SOURCE)
-
-GPTFDISK_VER = 1.0.4
-GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VER).tar.gz
-$(ARCHIVE)/$(GPTFDISK_SOURCE):
-	$(WGET) http://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VER)/$(GPTFDISK_SOURCE)
-
-POPT_VER = 1.16
-POPT_SOURCE = popt-$(POPT_VER).tar.gz
-$(ARCHIVE)/$(POPT_SOURCE):
-	$(WGET) http://rpm5.org/files/popt/$(POPT_SOURCE)
-
-LINKS_VER = 2.17
-$(ARCHIVE)/links-$(LINKS_VER).tar.bz2:
-	$(WGET) http://links.twibright.com/download/links-$(LINKS_VER).tar.bz2
diff --git a/make/gstreamer.mk b/make/gstreamer.mk
index ed4c84f0..134b64fd 100644
--- a/make/gstreamer.mk
+++ b/make/gstreamer.mk
@@ -35,7 +35,7 @@ $(ARCHIVE)/$(GSTREAMER_SOURCE):
 
 GSTREAMER_PATCH  = gstreamer-$(GSTREAMER_VER)-revert-use-new-gst-adapter-get-buffer.patch
 
-$(D)/gstreamer: $(D)/libglib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GSTREAMER_SOURCE)
+$(D)/gstreamer: $(D)/glib2 $(D)/libxml2 $(D)/glib-networking $(ARCHIVE)/$(GSTREAMER_SOURCE)
 	$(REMOVE)/gstreamer-$(GSTREAMER_VER)
 	$(UNTAR)/$(GSTREAMER_SOURCE)
 	$(CHDIR)/gstreamer-$(GSTREAMER_VER); \
@@ -90,7 +90,7 @@ GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-0004-subparse
 GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-make-gio_unix_2_0-dependency-configurable.patch
 GST_PLUGINS_BASE_PATCH += gst-plugins-base-$(GST_PLUGINS_BASE_VER)-0003-riff-media-added-fourcc-to-all-ffmpeg-mpeg4-video-caps.patch
 
-$(D)/gst-plugins-base: $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE) $(D)/gstreamer $(D)/zlib $(D)/libglib2 $(D)/orc $(D)/alsa-lib $(D)/libogg $(D)/libvorbisidec | $(TARGET_DIR)
+$(D)/gst-plugins-base: $(ARCHIVE)/$(GST_PLUGINS_BASE_SOURCE) $(D)/gstreamer $(D)/zlib $(D)/glib2 $(D)/orc $(D)/alsa-lib $(D)/libogg $(D)/libvorbisidec | $(TARGET_DIR)
 	$(REMOVE)/gst-plugins-base-$(GST_PLUGINS_BASE_VER)
 	$(UNTAR)/$(GST_PLUGINS_BASE_SOURCE)
 	$(CHDIR)/gst-plugins-base-$(GST_PLUGINS_BASE_VER); \
@@ -556,7 +556,7 @@ GLIB-NETWORKING_SOURCE = glib-networking-$(GLIB-NETWORKING_VER).tar.xz
 $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE):
 	$(WGET) https://ftp.acc.umu.se/pub/GNOME/sources/glib-networking/$(GLIB-NETWORKING_VER_MAJOR)/$(GLIB-NETWORKING_SOURCE)
 
-$(D)/glib-networking: $(D)/gnutls $(D)/libglib2 $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE)
+$(D)/glib-networking: $(D)/gnutls $(D)/glib2 $(ARCHIVE)/$(GLIB-NETWORKING_SOURCE)
 	$(REMOVE)/glib-networking-$(GLIB-NETWORKING_VER)
 	$(UNTAR)/$(GLIB-NETWORKING_SOURCE)
 	$(CHDIR)/glib-networking-$(GLIB-NETWORKING_VER); \
@@ -581,7 +581,7 @@ LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VER).tar.xz
 $(ARCHIVE)/$(LIBSOUP_SOURCE):
 	$(WGET) https://download.gnome.org/sources/libsoup/$(LIBSOUP_VER_MAJOR)/$(LIBSOUP_SOURCE)
 
-$(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/libglib2 $(ARCHIVE)/$(LIBSOUP_SOURCE)
+$(D)/libsoup: $(D)/sqlite $(D)/libxml2 $(D)/glib2 $(ARCHIVE)/$(LIBSOUP_SOURCE)
 	$(REMOVE)/libsoup-$(LIBSOUP_VER)
 	$(UNTAR)/$(LIBSOUP_SOURCE)
 	$(CHDIR)/libsoup-$(LIBSOUP_VER); \
diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index 4630754b..82ac0225 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -140,6 +140,11 @@ $(D)/neutrino-mediathek: $(ARCHIVE)/mediathek.git $(LIBPLUGINS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+LINKS_VER = 2.17
+
+$(ARCHIVE)/links-$(LINKS_VER).tar.bz2:
+	$(WGET) http://links.twibright.com/download/links-$(LINKS_VER).tar.bz2
+
 LINKS_PATCH  = links-$(LINKS_VER).patch
 LINKS_PATCH += links-$(LINKS_VER)-ac-prog-cxx.patch
 LINKS_PATCH += links-$(LINKS_VER)-input-$(BOXTYPE).patch
diff --git a/make/static-libs.mk b/make/static-libs.mk
index c9d47a58..0019c918 100644
--- a/make/static-libs.mk
+++ b/make/static-libs.mk
@@ -12,9 +12,14 @@ static-libs: $(STATIC_LIBS)
 
 # -----------------------------------------------------------------------------
 
+CORTEX-STRINGS_VER = 48fd30c346ff2ab14ca574b770b5c1bcbefadba8
+
+$(ARCHIVE)/cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2:
+	get-git-archive.sh http://git.linaro.org/git-ro/toolchain/cortex-strings.git $(CORTEX-STRINGS_VER) $(notdir $@) $(ARCHIVE)
+
 CORTEX-STRINGS_CONF =
 ifneq ($(BOXSERIES), hd51)
-	CORTEX-STRINGS_CONF = --without-neon
+  CORTEX-STRINGS_CONF = --without-neon
 endif
 
 cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la
diff --git a/make/system-libs-extra.mk b/make/system-libs-extra.mk
index 22091b4d..4747c71f 100644
--- a/make/system-libs-extra.mk
+++ b/make/system-libs-extra.mk
@@ -169,7 +169,7 @@ $(ARCHIVE)/$(CAIRO_SOURCE):
 
 CAIRO_PATCH  = cairo-$(CAIRO_VER)-get_bitmap_surface.diff
 
-$(D)/cairo: $(D)/fontconfig $(D)/libglib2 $(D)/libpng $(D)/pixman $(D)/zlib $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
+$(D)/cairo: $(D)/fontconfig $(D)/glib2 $(D)/libpng $(D)/pixman $(D)/zlib $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/cairo-$(CAIRO_VER)
 	$(UNTAR)/$(CAIRO_SOURCE)
 	$(CHDIR)/cairo-$(CAIRO_VER); \
@@ -220,7 +220,7 @@ $(ARCHIVE)/$(HARFBUZZ_SOURCE):
 
 HARFBUZZ_PATCH  = harfbuzz-$(HARFBUZZ_VER)-disable-docs.patch
 
-$(D)/harfbuzz: $(D)/fontconfig $(D)/libglib2 $(D)/cairo $(D)/freetype $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
+$(D)/harfbuzz: $(D)/fontconfig $(D)/glib2 $(D)/cairo $(D)/freetype $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/harfbuzz-$(HARFBUZZ_VER)
 	$(UNTAR)/$(HARFBUZZ_SOURCE)
 	$(CHDIR)/harfbuzz-$(HARFBUZZ_VER); \
diff --git a/make/system-libs.mk b/make/system-libs.mk
index 9f145969..87e8d6b1 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -483,6 +483,11 @@ $(D)/libdpf: $(D)/libusb_compat $(ARCHIVE)/$(LIBDPF_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+LZO_VER = 2.10
+
+$(ARCHIVE)/lzo-$(LZO_VER).tar.gz:
+	$(WGET) https://fossies.org/linux/misc/lzo-$(LZO_VER).tar.gz
+
 $(D)/lzo: $(ARCHIVE)/lzo-$(LZO_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/lzo-$(LZO_VER)
 	$(UNTAR)/lzo-$(LZO_VER).tar.gz
@@ -500,6 +505,14 @@ $(D)/lzo: $(ARCHIVE)/lzo-$(LZO_VER).tar.gz | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+LIBSIGCPP_MAJOR = 2
+LIBSIGCPP_MINOR = 4
+LIBSIGCPP_MICRO = 1
+LIBSIGCPP_VER = $(LIBSIGCPP_MAJOR).$(LIBSIGCPP_MINOR).$(LIBSIGCPP_MICRO)
+
+$(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz:
+	$(WGET) http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGCPP_MAJOR).$(LIBSIGCPP_MINOR)/libsigc++-$(LIBSIGCPP_VER).tar.xz
+
 $(D)/libsigc++: $(ARCHIVE)/libsigc++-$(LIBSIGCPP_VER).tar.xz | $(TARGET_DIR)
 	$(REMOVE)/libsigc++-$(LIBSIGCPP_VER)
 	$(UNTAR)/libsigc++-$(LIBSIGCPP_VER).tar.xz
@@ -712,6 +725,11 @@ $(D)/libass: $(D)/freetype $(D)/libfribidi $(ARCHIVE)/libass-$(LIBASS_VER).tar.x
 	
 # -----------------------------------------------------------------------------
 
+LIBGPG-ERROR_VER = 1.32
+
+$(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2:
+	$(WGET) ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2
+
 $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGET_DIR)
 	$(REMOVE)/libgpg-error-$(LIBGPG-ERROR_VER)
 	$(UNTAR)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2
@@ -740,6 +758,11 @@ $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGE
 
 # -----------------------------------------------------------------------------
 
+LIBGCRYPT_VER = 1.8.3
+
+$(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz:
+	$(WGET) ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(LIBGCRYPT_VER).tar.gz
+
 $(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error | $(TARGET_DIR)
 	$(REMOVE)/libgcrypt-$(LIBGCRYPT_VER)
 	$(UNTAR)/libgcrypt-$(LIBGCRYPT_VER).tar.gz
@@ -815,6 +838,11 @@ $(D)/libbdplus: $(ARCHIVE)/libbdplus-$(LIBBDPLUS_VER).tar.bz2 $(D)/libaacs | $(T
 
 # -----------------------------------------------------------------------------
 
+LIBXML2_VER = 2.9.8
+
+$(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz:
+	$(WGET) ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VER).tar.gz
+
 $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/libxml2-$(LIBXML2_VER)
 	$(UNTAR)/libxml2-$(LIBXML2_VER).tar.gz
@@ -847,6 +875,11 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+PUGIXML_VER = 1.9
+
+$(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz:
+	$(WGET) http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VER)/pugixml-$(PUGIXML_VER).tar.gz
+
 PUGIXML_PATCH = pugixml-config.patch
 
 $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGET_DIR)
@@ -878,6 +911,11 @@ $(D)/librtmp: $(D)/zlib $(D)/openssl $(SOURCE_DIR)/$(NI_RTMPDUMP) | $(TARGET_DIR
 
 # -----------------------------------------------------------------------------
 
+LIBTIRPC_VER = 1.0.2
+
+$(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2:
+	$(WGET) http://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VER)/libtirpc-$(LIBTIRPC_VER).tar.bz2
+
 LIBTIRP_PATCH  = libtirpc-0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch
 LIBTIRP_PATCH += libtirpc-0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch
 LIBTIRP_PATCH += libtirpc-0003-Add-rpcgen-program-from-nfs-utils-sources.patch
@@ -928,10 +966,15 @@ $(D)/confuse: $(ARCHIVE)/confuse-$(CONFUSE_VER).tar.xz | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-$(D)/libite: $(ARCHIVE)/libite-$(ITE_VER).tar.xz | $(TARGET_DIR)
-	$(REMOVE)/libite-$(ITE_VER)
-	$(UNTAR)/libite-$(ITE_VER).tar.xz
-	$(CHDIR)/libite-$(ITE_VER); \
+LIBITE_VER = 2.0.2
+
+$(ARCHIVE)/libite-$(LIBITE_VER).tar.xz:
+	$(WGET) https://github.com/troglobit/libite/releases/download/v$(LIBITE_VER)/libite-$(LIBITE_VER).tar.xz
+
+$(D)/libite: $(ARCHIVE)/libite-$(LIBITE_VER).tar.xz | $(TARGET_DIR)
+	$(REMOVE)/libite-$(LIBITE_VER)
+	$(UNTAR)/libite-$(LIBITE_VER).tar.xz
+	$(CHDIR)/libite-$(LIBITE_VER); \
 		$(CONFIGURE) \
 			--prefix= \
 			--docdir=/.remove \
@@ -943,7 +986,7 @@ $(D)/libite: $(ARCHIVE)/libite-$(ITE_VER).tar.xz | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/libite.pc
-	$(REMOVE)/libite-$(ITE_VER)
+	$(REMOVE)/libite-$(LIBITE_VER)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -1015,6 +1058,11 @@ $(D)/libogg: $(ARCHIVE)/libogg-$(LIBOGG_VER).tar.xz | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+FRIBIDI_VER = 1.0.4
+
+$(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2:
+	$(WGET) https://download.videolan.org/contrib/fribidi/fribidi-$(FRIBIDI_VER).tar.bz2
+
 $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGET_DIR)
 	$(REMOVE)/fribidi-$(FRIBIDI_VER)
 	$(UNTAR)/fribidi-$(FRIBIDI_VER).tar.bz2
@@ -1036,6 +1084,11 @@ $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+LIBFFI_VER = 3.2.1
+
+$(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz:
+	$(WGET) ftp://sourceware.org/pub/libffi/libffi-$(LIBFFI_VER).tar.gz
+
 LIBFFI_PATCH  = libffi-install_headers.patch
 
 LIBFFI_CONF =
@@ -1064,23 +1117,31 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz
 
 # glibc provides a stub gettext implementation, so we only build it for hd2
 
-LIBGLIB2_DEPS =
+GLIB2_MAJOR = 2
+GLIB2_MINOR = 56
+GLIB2_MICRO = 3
+GLIB2_VER = $(GLIB2_MAJOR).$(GLIB2_MINOR).$(GLIB2_MICRO)
+
+$(ARCHIVE)/glib-$(GLIB2_VER).tar.xz:
+	$(WGET) http://ftp.gnome.org/pub/gnome/sources/glib/$(GLIB2_MAJOR).$(GLIB2_MINOR)/glib-$(GLIB2_VER).tar.xz
+
+GLIB2_PATCH  = glib2-disable-tests.patch
+
+GLIB2_DEPS =
 ifeq ($(BOXSERIES), hd2)
-	LIBGLIB2_DEPS = $(D)/gettext
+  GLIB2_DEPS = $(D)/gettext
 endif
 
-LIBGLIB2_CONF =
+GLIB2_CONF =
 ifeq ($(BOXSERIES), hd1)
-	LIBGLIB2_CONF = --enable-static --disable-shared
+  GLIB2_CONF = --enable-static --disable-shared
 endif
 
-LIBGLIB2_PATCH  = libglib2-disable-tests.patch
-
-$(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D)/libffi | $(TARGET_DIR)
-	$(REMOVE)/glib-$(GLIB_VER)
-	$(UNTAR)/glib-$(GLIB_VER).tar.xz
-	$(CHDIR)/glib-$(GLIB_VER); \
-		$(call apply_patches, $(LIBGLIB2_PATCH)); \
+$(D)/glib2: $(ARCHIVE)/glib-$(GLIB2_VER).tar.xz $(D)/zlib $(GLIB2_DEPS) $(D)/libffi | $(TARGET_DIR)
+	$(REMOVE)/glib-$(GLIB2_VER)
+	$(UNTAR)/glib-$(GLIB2_VER).tar.xz
+	$(CHDIR)/glib-$(GLIB2_VER); \
+		$(call apply_patches, $(GLIB2_PATCH)); \
 		echo "ac_cv_type_long_long=yes"		 > arm-linux.cache; \
 		echo "glib_cv_stack_grows=no"		>> arm-linux.cache; \
 		echo "glib_cv_uscore=no"		>> arm-linux.cache; \
@@ -1102,7 +1163,7 @@ $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D
 			--disable-compile-warnings \
 			--with-threads="posix" \
 			--with-pcre=internal \
-			$(LIBGLIB2_CONF) \
+			$(GLIB2_CONF) \
 			; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/bin/gapplication
@@ -1126,11 +1187,17 @@ $(D)/libglib2: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB2_DEPS) $(D
 	$(REWRITE_LIBTOOL)/libgmodule-2.0.la
 	$(REWRITE_LIBTOOL)/libgobject-2.0.la
 	$(REWRITE_LIBTOOL)/libgthread-2.0.la
-	$(REMOVE)/glib-$(GLIB_VER)
+	$(REMOVE)/glib-$(GLIB2_VER)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
+ALSA-LIB_VER = 1.1.8
+ALSA-LIB_SOURCE = alsa-lib-$(ALSA-LIB_VER).tar.bz2
+
+$(ARCHIVE)/$(ALSA-LIB_SOURCE):
+	$(WGET) ftp://ftp.alsa-project.org/pub/lib/$(ALSA-LIB_SOURCE)
+
 ALSA-LIB_PATCH  = alsa-lib.patch
 ALSA-LIB_PATCH += alsa-lib-link_fix.patch
 
diff --git a/make/system-tools.mk b/make/system-tools.mk
index f5eb55af..b5189f5a 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -3,6 +3,20 @@
 #
 # -----------------------------------------------------------------------------
 
+BUSYBOX_MAJOR = 1
+BUSYBOX_MINOR = 30
+BUSYBOX_MICRO = 1
+BUSYBOX_VER = $(BUSYBOX_MAJOR).$(BUSYBOX_MINOR).$(BUSYBOX_MICRO)
+BUSYBOX_SOURCE = busybox-$(BUSYBOX_VER).tar.bz2
+
+$(ARCHIVE)/$(BUSYBOX_SOURCE):
+	$(WGET) http://busybox.net/downloads/$(BUSYBOX_SOURCE)
+
+BUSYBOX_PATCH  = busybox-fix-config-header.diff
+BUSYBOX_PATCH += busybox-insmod-hack.patch
+BUSYBOX_PATCH += busybox-mount-use-var-etc-fstab.patch
+BUSYBOX_PATCH += busybox-fix-partition-size.patch
+
 # Link busybox against libtirpc so that we can leverage its RPC support for NFS
 # mounting with BusyBox
 BUSYBOX_CFLAGS = $(TARGET_CFLAGS)
@@ -26,11 +40,6 @@ BUSYBOX_MAKE_OPTS = \
 	EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 	CONFIG_PREFIX="$(TARGET_DIR)"
 
-BUSYBOX_PATCH  = busybox-fix-config-header.diff
-BUSYBOX_PATCH += busybox-insmod-hack.patch
-BUSYBOX_PATCH += busybox-mount-use-var-etc-fstab.patch
-BUSYBOX_PATCH += busybox-fix-partition-size.patch
-
 $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/busybox-$(BUSYBOX_VER)
 	$(UNTAR)/$(BUSYBOX_SOURCE)
@@ -270,6 +279,11 @@ $(D)/coreutils: $(ARCHIVE)/coreutils-$(COREUTILS_VER).tar.xz | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+LESS_VER = 530
+
+$(ARCHIVE)/less-$(LESS_VER).tar.gz:
+	$(WGET) http://www.greenwoodsoftware.com/less/less-$(LESS_VER).tar.gz
+
 $(D)/less: $(D)/libncurses $(ARCHIVE)/less-$(LESS_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/less-$(LESS_VER)
 	$(UNTAR)/less-$(LESS_VER).tar.gz
@@ -366,10 +380,15 @@ $(D)/ushare: $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 $(D)/libupnp | $(TARGET_DIR
 
 # -----------------------------------------------------------------------------
 
-$(D)/smartmontools: $(ARCHIVE)/smartmontools-$(SMARTMON_VER).tar.gz | $(TARGET_DIR)
-	$(REMOVE)/smartmontools-$(SMARTMON_VER)
-	$(UNTAR)/smartmontools-$(SMARTMON_VER).tar.gz
-	$(CHDIR)/smartmontools-$(SMARTMON_VER); \
+SMARTMONTOOLS_VER = 6.6
+
+$(ARCHIVE)/smartmontools-$(SMARTMONTOOLS_VER).tar.gz:
+	$(WGET) http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VER)/smartmontools-$(SMARTMONTOOLS_VER).tar.gz
+
+$(D)/smartmontools: $(ARCHIVE)/smartmontools-$(SMARTMONTOOLS_VER).tar.gz | $(TARGET_DIR)
+	$(REMOVE)/smartmontools-$(SMARTMONTOOLS_VER)
+	$(UNTAR)/smartmontools-$(SMARTMONTOOLS_VER).tar.gz
+	$(CHDIR)/smartmontools-$(SMARTMONTOOLS_VER); \
 		$(BUILDENV) \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
@@ -377,7 +396,7 @@ $(D)/smartmontools: $(ARCHIVE)/smartmontools-$(SMARTMON_VER).tar.gz | $(TARGET_D
 			; \
 		$(MAKE); \
 		install -D -m 0755 smartctl $(TARGET_DIR)/sbin/smartctl
-	$(REMOVE)/smartmontools-$(SMARTMON_VER)
+	$(REMOVE)/smartmontools-$(SMARTMONTOOLS_VER)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -451,6 +470,12 @@ $(D)/procps-ng: $(D)/libncurses $(ARCHIVE)/procps-ng-$(PROCPS-NG_VER).tar.xz | $
 
 # -----------------------------------------------------------------------------
 
+NANO_VER_MAJOR = 4
+NANO_VER = $(NANO_VER_MAJOR).2
+
+$(ARCHIVE)/nano-$(NANO_VER).tar.gz:
+	$(WGET) http://www.nano-editor.org/dist/v$(NANO_VER_MAJOR)/nano-$(NANO_VER).tar.gz
+
 $(D)/nano: $(D)/libncurses $(ARCHIVE)/nano-$(NANO_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/nano-$(NANO_VER)
 	$(UNTAR)/nano-$(NANO_VER).tar.gz
@@ -467,6 +492,11 @@ $(D)/nano: $(D)/libncurses $(ARCHIVE)/nano-$(NANO_VER).tar.gz | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+MINICOM_VER = 2.7.1
+
+$(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz:
+	$(WGET) http://fossies.org/linux/misc/minicom-$(MINICOM_VER).tar.gz
+
 MINICOM_PATCH  = minicom-fix-h-v-return-value-is-not-0.patch
 
 $(D)/minicom: $(D)/libncurses $(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz | $(TARGET_DIR)
@@ -486,6 +516,18 @@ $(D)/minicom: $(D)/libncurses $(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz | $(TARGE
 
 # -----------------------------------------------------------------------------
 
+BASH_MAJOR = 5
+BASH_MINOR = 0
+BASH_MICRO = 0
+ifeq ($(BASH_MICRO), 0)
+  BASH_VER = $(BASH_MAJOR).$(BASH_MINOR)
+else
+  BASH_VER = $(BASH_MAJOR).$(BASH_MINOR).$(BASH_MICRO)
+endif
+
+$(ARCHIVE)/bash-$(BASH_VER).tar.gz:
+	$(WGET) http://ftp.gnu.org/gnu/bash/bash-$(BASH_VER).tar.gz
+
 $(D)/bash: $(ARCHIVE)/bash-$(BASH_VER).tar.gz | $(TARGET_DIR)
 	$(REMOVE)/bash-$(BASH_VER)
 	$(UNTAR)/bash-$(BASH_VER).tar.gz
@@ -926,6 +968,11 @@ $(D)/xupnpd: $(ARCHIVE)/xupnpd.git $(D)/lua $(D)/openssl | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+DOSFSTOOLS_VER = 4.1
+
+$(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz:
+	$(WGET) https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VER)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
+
 DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
 
 $(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(TARGET_DIR)
@@ -948,10 +995,10 @@ $(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.
 
 # -----------------------------------------------------------------------------
 
-NFS-UTILS_IPV6=--enable-ipv6
-ifeq ($(BOXSERIES), hd1)
-	NFS-UTILS_IPV6=--disable-ipv6
-endif
+NFS-UTILS_VER = 2.2.1
+
+$(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2:
+	$(WGET) http://sourceforge.net/projects/nfs/files/nfs-utils/$(NFS-UTILS_VER)/nfs-utils-$(NFS-UTILS_VER).tar.bz2
 
 NFS-UTILS_PATCH  = nfs-utils_01-Patch-taken-from-Gentoo.patch
 NFS-UTILS_PATCH += nfs-utils_02-Switch-legacy-index-in-favour-of-strchr.patch
@@ -959,6 +1006,11 @@ NFS-UTILS_PATCH += nfs-utils_03-Let-the-configure-script-find-getrpcbynumber-in-
 NFS-UTILS_PATCH += nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch
 NFS-UTILS_PATCH += nfs-utils_05-sm-notify-use-sbin-instead-of-usr-sbin.patch
 
+NFS-UTILS_IPV6 = --enable-ipv6
+ifeq ($(BOXSERIES), hd1)
+  NFS-UTILS_IPV6 = --disable-ipv6
+endif
+
 $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(TARGET_DIR)
 	$(REMOVE)/nfs-utils-$(NFS-UTILS_VER)
 	$(UNTAR)/nfs-utils-$(NFS-UTILS_VER).tar.bz2
@@ -1001,6 +1053,11 @@ $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/nfs-utils-$(NFS-UTILS_VER).tar.bz2 | $(T
 
 # -----------------------------------------------------------------------------
 
+RPCBIND_VER = 1.2.5
+
+$(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2:
+	$(WGET) http://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VER)/rpcbind-$(RPCBIND_VER).tar.bz2
+
 RPCBIND_PATCH  = rpcbind-0001-Remove-yellow-pages-support.patch
 
 $(D)/rpcbind: $(D)/libtirpc $(ARCHIVE)/rpcbind-$(RPCBIND_VER).tar.bz2 | $(TARGET_DIR)
@@ -1045,10 +1102,15 @@ $(D)/fuse-exfat: $(ARCHIVE)/fuse-exfat-$(FUSE_EXFAT_VER).tar.gz $(D)/libfuse | $
 
 # -----------------------------------------------------------------------------
 
-$(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exfat | $(TARGET_DIR)
-	$(REMOVE)/exfat-utils-$(EXFAT_UTILS_VER)
-	$(UNTAR)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz
-	$(CHDIR)/exfat-utils-$(EXFAT_UTILS_VER); \
+EXFAT-UTILS_VER = 1.2.8
+
+$(ARCHIVE)/exfat-utils-$(EXFAT-UTILS_VER).tar.gz:
+	$(WGET) https://github.com/relan/exfat/releases/download/v$(EXFAT-UTILS_VER)/exfat-utils-$(EXFAT-UTILS_VER).tar.gz
+
+$(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT-UTILS_VER).tar.gz $(D)/fuse-exfat | $(TARGET_DIR)
+	$(REMOVE)/exfat-utils-$(EXFAT-UTILS_VER)
+	$(UNTAR)/exfat-utils-$(EXFAT-UTILS_VER).tar.gz
+	$(CHDIR)/exfat-utils-$(EXFAT-UTILS_VER); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
@@ -1057,12 +1119,12 @@ $(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exf
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/exfat-utils-$(EXFAT_UTILS_VER)
+	$(REMOVE)/exfat-utils-$(EXFAT-UTILS_VER)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-$(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib2 | $(TARGET_DIR)
+$(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/glib2 | $(TARGET_DIR)
 	$(REMOVE)/$(NI_STREAMRIPPER)
 	tar -C $(SOURCE_DIR) -cp $(NI_STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	$(CHDIR)/$(NI_STREAMRIPPER); \
@@ -1082,6 +1144,11 @@ $(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/libglib2 | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+GETTEXT_VERSION = 0.19.8.1
+
+$(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz:
+	$(WGET) ftp://ftp.gnu.org/gnu/gettext/gettext-$(GETTEXT_VERSION).tar.xz
+
 $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGET_DIR)
 	$(REMOVE)/gettext-$(GETTEXT_VERSION)
 	$(UNTAR)/gettext-$(GETTEXT_VERSION).tar.xz
@@ -1111,7 +1178,12 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VERSION).tar.xz | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-$(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/libglib2 $(D)/libncurses | $(TARGET_DIR)
+MC_VER = 4.8.22
+
+$(ARCHIVE)/mc-$(MC_VER).tar.xz:
+	$(WGET) http://ftp.midnight-commander.org/mc-$(MC_VER).tar.xz
+
+$(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/glib2 $(D)/libncurses | $(TARGET_DIR)
 	$(REMOVE)/mc-$(MC_VER)
 	$(UNTAR)/mc-$(MC_VER).tar.xz
 	$(CHDIR)/mc-$(MC_VER); \
@@ -1142,6 +1214,11 @@ $(D)/mc: $(ARCHIVE)/mc-$(MC_VER).tar.xz $(D)/libglib2 $(D)/libncurses | $(TARGET
 
 # -----------------------------------------------------------------------------
 
+WGET_VER = 1.19.2
+
+$(ARCHIVE)/wget-$(WGET_VER).tar.gz:
+	$(WGET) http://ftp.gnu.org/gnu/wget/wget-$(WGET_VER).tar.gz
+
 WGET_PATCH  = wget-remove-hardcoded-engine-support-for-openss.patch
 WGET_PATCH += wget-set-check_cert-false-by-default.patch
 WGET_PATCH += wget-change_DEFAULT_LOGFILE.patch
@@ -1255,6 +1332,12 @@ $(D)/dvbsnoop: $(ARCHIVE)/dvbsnoop.git | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+ETHTOOL_VER = 4.19
+ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VER).tar.xz
+
+$(ARCHIVE)/$(ETHTOOL_SOURCE):
+	$(WGET) https://www.kernel.org/pub/software/network/ethtool/$(ETHTOOL_SOURCE)
+
 $(D)/ethtool: $(ARCHIVE)/$(ETHTOOL_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/ethtool-$(ETHTOOL_VER)
 	$(UNTAR)/$(ETHTOOL_SOURCE)
@@ -1272,6 +1355,12 @@ $(D)/ethtool: $(ARCHIVE)/$(ETHTOOL_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
+GPTFDISK_VER = 1.0.4
+GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VER).tar.gz
+
+$(ARCHIVE)/$(GPTFDISK_SOURCE):
+	$(WGET) http://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VER)/$(GPTFDISK_SOURCE)
+
 $(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/gptfdisk-$(GPTFDISK_VER)
 	$(UNTAR)/$(GPTFDISK_SOURCE)
@@ -1286,6 +1375,12 @@ $(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET
 
 # -----------------------------------------------------------------------------
 
+POPT_VER = 1.16
+POPT_SOURCE = popt-$(POPT_VER).tar.gz
+
+$(ARCHIVE)/$(POPT_SOURCE):
+	$(WGET) http://rpm5.org/files/popt/$(POPT_SOURCE)
+
 $(D)/popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/popt-$(POPT_VER)
 	$(UNTAR)/$(POPT_SOURCE)