diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk
index fa5117d0..f5b11b71 100644
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@@ -4,18 +4,21 @@
 # -----------------------------------------------------------------------------
 
 # usbutils-008 needs udev
-USBUTILS_VER = 007
+USBUTILS_VER    = 007
+USBUTILS        = usbutils-$(USBUTILS_VER)
+USBUTILS_SOURCE = usbutils-$(USBUTILS_VER).tar.xz
+USBUTILS_URL    = https://www.kernel.org/pub/linux/utils/usb/usbutils
 
-$(ARCHIVE)/usbutils-$(USBUTILS_VER).tar.xz:
-	$(DOWNLOAD) https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-$(USBUTILS_VER).tar.xz
+$(ARCHIVE)/$(USBUTILS_SOURCE):
+	$(DOWNLOAD) $(USBUTILS_URL)/$(USBUTILS_SOURCE)
 
 USBUTILS_PATCH  = usbutils-avoid-dependency-on-bash.patch
 USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch
 
-$(D)/usbutils: $(D)/libusb-compat $(ARCHIVE)/usbutils-$(USBUTILS_VER).tar.xz | $(TARGET_DIR)
-	$(REMOVE)/usbutils-$(USBUTILS_VER)
-	$(UNTAR)/usbutils-$(USBUTILS_VER).tar.xz
-	$(CHDIR)/usbutils-$(USBUTILS_VER); \
+$(D)/usbutils: $(D)/libusb-compat $(ARCHIVE)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(USBUTILS)
+	$(UNTAR)/$(USBUTILS_SOURCE)
+	$(CHDIR)/$(USBUTILS); \
 		$(call apply_patches, $(USBUTILS_PATCH)); \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
@@ -25,25 +28,28 @@ $(D)/usbutils: $(D)/libusb-compat $(ARCHIVE)/usbutils-$(USBUTILS_VER).tar.xz | $
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	rm -rf $(TARGET_DIR)/bin/lsusb.py
-	rm -rf $(TARGET_DIR)/bin/usbhid-dump
+	rm -rf $(TARGET_BIN_DIR)/lsusb.py
+	rm -rf $(TARGET_BIN_DIR)/usbhid-dump
 	rm -rf $(TARGET_DIR)/sbin/update-usbids.sh
 	rm -rf $(TARGET_SHARE_DIR)/pkgconfig
 	rm -rf $(TARGET_SHARE_DIR)/usb.ids.gz
-	$(REMOVE)/usbutils-$(USBUTILS_VER)
+	$(REMOVE)/$(USBUTILS)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-BINUTILS_VER = 2.25
+BINUTILS_VER    = 2.25
+BINUTILS        = binutils-$(BINUTILS_VER)
+BINUTILS_SOURCE = binutils-$(BINUTILS_VER).tar.bz2
+BINUTILS_URL    = https://ftp.gnu.org/gnu/binutils
 
-$(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2:
-	$(DOWNLOAD) https://ftp.gnu.org/gnu/binutils/binutils-$(BINUTILS_VER).tar.bz2
+$(ARCHIVE)/$(BINUTILS_SOURCE):
+	$(DOWNLOAD) $(BINUTILS_URL)/$(BINUTILS_SOURCE)
 
-$(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGET_DIR)
-	$(REMOVE)/binutils-$(BINUTILS_VER)
-	$(UNTAR)/binutils-$(BINUTILS_VER).tar.bz2
-	$(CHDIR)/binutils-$(BINUTILS_VER); \
+$(D)/binutils: $(ARCHIVE)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(BINUTILS)
+	$(UNTAR)/$(BINUTILS_SOURCE)
+	$(CHDIR)/$(BINUTILS); \
 		$(CONFIGURE) \
 			--target=$(TARGET) \
 			--prefix= \
@@ -54,36 +60,31 @@ $(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGET_DIR)
 			--disable-sim \
 			--disable-gdb \
 			; \
-		$(MAKE)
-		install -m 0755 $(BUILD_TMP)/binutils-$(BINUTILS_VER)/binutils/objdump $(BIN)/
-		install -m 0755 $(BUILD_TMP)/binutils-$(BINUTILS_VER)/binutils/objcopy $(BIN)/
-	$(REMOVE)/binutils-$(BINUTILS_VER)
+		$(MAKE); \
+		install -m 0755 binutils/objdump $(TARGET_BIN_DIR)/
+		install -m 0755 binutils/objcopy $(TARGET_BIN_DIR)/
+	$(REMOVE)/$(BINUTILS)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-UTIL-LINUX_VER_MAJOR = 2
-UTIL-LINUX_VER_MINOR = 34
-UTIL-LINUX_VER_MICRO = 0
-ifeq ($(UTIL-LINUX_VER_MICRO), 0)
-  UTIL-LINUX_VER = $(UTIL-LINUX_VER_MAJOR).$(UTIL-LINUX_VER_MINOR)
-else
-  UTIL-LINUX_VER = $(UTIL-LINUX_VER_MAJOR).$(UTIL-LINUX_VER_MINOR).$(UTIL-LINUX_VER_MICRO)
-endif
+UTIL_LINUX_ABIVER = 2.34
+UTIL_LINUX_VER    = 2.34
+UTIL_LINUX        = util-linux-$(UTIL_LINUX_VER)
+UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VER).tar.xz
+UTIL_LINUX_URL    = https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL_LINUX_ABIVER)
 
-$(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz:
-	$(DOWNLOAD) https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL-LINUX_VER_MAJOR).$(UTIL-LINUX_VER_MINOR)/util-linux-$(UTIL-LINUX_VER).tar.xz
+$(ARCHIVE)/$(UTIL_LINUX_SOURCE):
+	$(DOWNLOAD) $(UTIL_LINUX_URL)/$(UTIL_LINUX_SOURCE)
 
-$(D)/util-linux: $(D)/ncurses $(D)/zlib $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).tar.xz | $(TARGET_DIR)
-	$(REMOVE)/util-linux-$(UTIL-LINUX_VER)
-	$(UNTAR)/util-linux-$(UTIL-LINUX_VER).tar.xz
-	$(CHDIR)/util-linux-$(UTIL-LINUX_VER); \
+$(D)/util-linux: $(D)/ncurses $(D)/zlib $(ARCHIVE)/$(UTIL_LINUX_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(UTIL-LINUX)
+	$(UNTAR)/$(UTIL-LINUX_SOURCE)
+	$(CHDIR)/$(UTIL-LINUX); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--datarootdir=/.remove/share \
-			--mandir=/.remove/man \
-			--localedir=/.remove/locale \
 			--enable-static \
 			--disable-shared \
 			--disable-hardlink \
@@ -114,115 +115,68 @@ $(D)/util-linux: $(D)/ncurses $(D)/zlib $(ARCHIVE)/util-linux-$(UTIL-LINUX_VER).
 	$(REWRITE_LIBTOOL)/libfdisk.la
 	$(REWRITE_LIBTOOL)/libsmartcols.la
 	$(REWRITE_LIBTOOL)/libuuid.la
-	#$(REMOVE)/util-linux-$(UTIL-LINUX_VER)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
-IPTABLES_VER = 1.4.21
-
-$(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2:
-	$(DOWNLOAD) http://www.netfilter.org/projects/iptables/files/iptables-$(IPTABLES_VER).tar.bz2
-
-$(D)/iptables: $(ARCHIVE)/iptables-$(IPTABLES_VER).tar.bz2 | $(TARGET_DIR)
-	$(REMOVE)/iptables-$(IPTABLES_VER)
-	$(UNTAR)/iptables-$(IPTABLES_VER).tar.bz2
-	$(CHDIR)/iptables-$(IPTABLES_VER); \
-		$(CONFIGURE) \
-			--prefix= \
-			--mandir=/.remove \
-			; \
-		$(MAKE); \
-		make install DESTDIR=$(TARGET_DIR)
-	$(REWRITE_LIBTOOL)/libip4tc.la
-	$(REWRITE_LIBTOOL)/libip6tc.la
-	$(REWRITE_LIBTOOL)/libiptc.la
-	$(REWRITE_LIBTOOL)/libxtables.la
-	$(REWRITE_PKGCONF)/libip4tc.pc
-	$(REWRITE_PKGCONF)/libip6tc.pc
-	$(REWRITE_PKGCONF)/libiptc.pc
-	$(REWRITE_PKGCONF)/xtables.pc
-	$(REMOVE)/iptables-$(IPTABLES_VER)
+	$(REMOVE)/$(UTIL-LINUX)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-LIGHTTPD_VER = 1.4.31
-
-$(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz:
-	$(DOWNLOAD) http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$(LIGHTTPD_VER).tar.gz
-
-$(D)/lighttpd: $(D)/zlib $(ARCHIVE)/lighttpd-$(LIGHTTPD_VER).tar.gz | $(TARGET_DIR)
-	$(REMOVE)/lighttpd-$(LIGHTTPD_VER)
-	$(UNTAR)/lighttpd-$(LIGHTTPD_VER).tar.gz
-	$(CHDIR)/lighttpd-$(LIGHTTPD_VER); \
-		$(BUILDENV) ./configure \
-			--build=$(BUILD) \
-			--host=$(TARGET) \
-			--prefix= \
-			--mandir=/.remove \
-			--docdir=/.remove \
-			--infodir=/.remove \
-			--with-zlib \
-			--enable-silent-rules \
-			--without-pcre \
-			--without-bzip2 \
-			; \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/lighttpd-$(LIGHTTPD_VER)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
+ASTRA-SM_VER    = git
+ASTRA-SM        = astra-sm.$(ASTRA-SM_VER)
+ASTRA-SM_SOURCE = astra-sm.$(ASTRA-SM_VER)
+ASTRA-SM_URL    = https://gitlab.com/crazycat69/astra-sm.git
 
 # workaround unrecognized command line options
 $(D)/astra-sm: TARGET_ABI=""
 $(D)/astra-sm: $(D)/openssl | $(TARGET_DIR)
-	$(REMOVE)/astra-sm.git
-	get-git-source.sh https://gitlab.com/crazycat69/astra-sm.git $(ARCHIVE)/astra-sm.git
-	$(CPDIR)/astra-sm.git
-	$(CHDIR)/astra-sm.git; \
+	$(REMOVE)/$(ASTRA-SM)
+	get-git-source.sh $(ASTRA-SM_URL)/$(ASTRA-SM_SOURCE) $(ARCHIVE)/$(ASTRA-SM_SOURCE)
+	$(CPDIR)/$(ASTRA-SM_SOURCE)
+	$(CHDIR)/$(ASTRA-SM); \
 		autoreconf -fi; \
 		$(CONFIGURE) \
 			--prefix= \
 			--without-lua \
 			; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/astra-sm.git
+	$(REMOVE)/$(ASTRA-SM)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-IOZONE_VER = 482
+IOZONE_VER    = 482
+IOZONE        = iozone3_$(IOZONE_VER)
 IOZONE_SOURCE = iozone3_$(IOZONE_VER).tar
+IOZONE_URL    = http://www.iozone.org/src/current
 
 $(ARCHIVE)/$(IOZONE_SOURCE):
-	$(DOWNLOAD) http://www.iozone.org/src/current/$(IOZONE_SOURCE)
+	$(DOWNLOAD) $(IOZONE_URL)/$(IOZONE_SOURCE)
 
 $(D)/iozone3: $(ARCHIVE)/$(IOZONE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/iozone3_$(IOZONE_VER)
+	$(REMOVE)/$(IOZONE)
 	$(UNTAR)/$(IOZONE_SOURCE)
-	$(CHDIR)/iozone3_$(IOZONE_VER)/src/current; \
+	$(CHDIR)/$(IOZONE)/src/current; \
 		sed -i -e "s/= gcc/= $(TARGET)-gcc/" makefile; \
 		sed -i -e "s/= cc/= $(TARGET)-cc/" makefile; \
 		$(BUILDENV) \
 		$(MAKE) linux-arm; \
-		install -m 0755 iozone $(TARGET_DIR)/bin
-	$(REMOVE)/iozone3_$(IOZONE_VER)
+		install -m 0755 iozone $(TARGET_BIN_DIR)/
+	$(REMOVE)/$(IOZONE)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-RSYNC_VER = 3.1.3
+RSYNC_VER    = 3.1.3
+RSYNC        = rsync-$(RSYNC_VER)
 RSYNC_SOURCE = rsync-$(RSYNC_VER).tar.gz
+RSYNC_URL    = https://ftp.samba.org/pub/rsync
 
 $(ARCHIVE)/$(RSYNC_SOURCE):
-	$(DOWNLOAD) https://ftp.samba.org/pub/rsync/$(RSYNC_SOURCE)
+	$(DOWNLOAD) $(RSYNC_URL)/$(RSYNC_SOURCE)
 
 $(D)/rsync: $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/rsync-$(RSYNC_VER)
+	$(REMOVE)/$(RSYNC)
 	$(UNTAR)/$(RSYNC_SOURCE)
-	$(CHDIR)/rsync-$(RSYNC_VER); \
+	$(CHDIR)/$(RSYNC); \
 		$(CONFIGURE) \
 			--prefix= \
 			--mandir=/.remove \
@@ -232,27 +186,29 @@ $(D)/rsync: $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE) all; \
 		$(MAKE) install-all DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/rsync-$(RSYNC_VER)
+	$(REMOVE)/$(RSYNC)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-READLINE_VER = 8.0
+READLINE_VER    = 8.0
+READLINE        = readline-$(READLINE_VER)
 READLINE_SOURCE = readline-$(READLINE_VER).tar.gz
+READLINE_URL    = https://ftp.gnu.org/gnu/readline
 
 $(ARCHIVE)/$(READLINE_SOURCE):
-	$(DOWNLOAD) https://ftp.gnu.org/gnu/readline/$(READLINE_SOURCE)
+	$(DOWNLOAD) $(READLINE_URL)/$(READLINE_SOURCE)
 
 $(D)/readline: $(ARCHIVE)/$(READLINE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/readline-$(READLINE_VER)
+	$(REMOVE)/$(READLINE)
 	$(UNTAR)/$(READLINE_SOURCE)
-	$(CHDIR)/readline-$(READLINE_VER); \
+	$(CHDIR)/$(READLINE); \
 		$(CONFIGURE) \
 			--prefix= \
-			--datarootdir=/.remove \
+			--datarootdir=/.remove/share \
 			; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_PKGCONF)/readline.pc
-	$(REMOVE)/readline-$(READLINE_VER)
+	$(REMOVE)/$(READLINE)
 	$(TOUCH)