diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk
index 269e7da6..d5a3227b 100644
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@@ -64,55 +64,6 @@ binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-BASE_PASSWD_VERSION = 3.5.29
-BASE_PASSWD_DIR = base-passwd-$(BASE_PASSWD_VERSION)
-BASE_PASSWD_SOURCE = base-passwd_$(BASE_PASSWD_VERSION).tar.gz
-BASE_PASSWD_SITE = https://launchpad.net/debian/+archive/primary/+files
-
-$(DL_DIR)/$(BASE_PASSWD_SOURCE):
-	$(download) $(BASE_PASSWD_SITE)/$(BASE_PASSWD_SOURCE)
-
-base-passwd: $(DL_DIR)/$(BASE_PASSWD_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(PKG_DIR)
-	$(UNTAR)/$(PKG_SOURCE)
-	$(call APPLY_PATCHES,$(PKG_PATCHES_DIR))
-	$(CHDIR)/$(PKG_DIR); \
-		$(CONFIGURE); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(INSTALL_DATA) -D $(PKG_BUILD_DIR)/group.master $(TARGET_datadir)/base-passwd/group.master
-	$(INSTALL_DATA) -D $(PKG_BUILD_DIR)/passwd.master $(TARGET_datadir)/base-passwd/passwd.master
-	$(REMOVE)/$(PKG_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
-SHADOW_VERSION = 4.8.1
-SHADOW_DIR = shadow-$(SHADOW_VERSION)
-SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz
-SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION)
-
-$(DL_DIR)/$(SHADOW_SOURCE):
-	$(download) $(SHADOW_SITE)/$(SHADOW_SOURCE)
-
-SHADOW_CONF_OPTS = \
-	--prefix=$(base_prefix) \
-	--datarootdir=$(REMOVE_base_datarootdir)
-
-shadow: $(DL_DIR)/$(SHADOW_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(PKG_DIR)
-	$(UNTAR)/$(PKG_SOURCE)
-	$(CHDIR)/$(PKG_DIR); \
-		$(CONFIGURE); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(SED) 's|SHELL=.*|SHELL=/bin/sh|' $(TARGET_sysconfdir)/default/useradd
-	$(INSTALL) -d $(TARGET_sysconfdir)/skel
-	$(REMOVE)/$(PKG_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 BZIP2_VERSION = 1.0.8
 BZIP2_DIR = bzip2-$(BZIP2_VERSION)
 BZIP2_SOURCE = bzip2-$(BZIP2_VERSION).tar.gz
@@ -136,32 +87,6 @@ bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-ASTRA_SM_VERSION = git
-ASTRA_SM_DIR = astra-sm.$(ASTRA_SM_VERSION)
-ASTRA_SM_SOURCE = astra-sm.$(ASTRA_SM_VERSION)
-ASTRA_SM_SITE = https://gitlab.com/crazycat69
-
-ASTRA_SM_DEPENDENCIES = openssl
-
-ASTRA_SM_AUTORECONF = YES
-
-ASTRA_SM_CONF_OPTS = \
-	--without-lua
-
-astra-sm: $(ASTRA_SM_DEPENDENCIES) | $(TARGET_DIR)
-	$(REMOVE)/$(ASTRA_SM_DIR)
-	$(GET_GIT_SOURCE) $(ASTRA_SM_SITE)/$(ASTRA_SM_SOURCE) $(DL_DIR)/$(ASTRA_SM_SOURCE)
-	$(CPDIR)/$(ASTRA_SM_SOURCE)
-	$(CHDIR)/$(ASTRA_SM_DIR); \
-		sed -i 's:(CFLAGS):(CFLAGS_FOR_BUILD):' tools/Makefile.am; \
-		$(CONFIGURE); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(ASTRA_SM_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 IOZONE_VERSION = 3_490
 IOZONE_DIR = iozone$(IOZONE_VERSION)
 IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
@@ -184,29 +109,6 @@ iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-READLINE_VERSION = 8.1
-READLINE_DIR = readline-$(READLINE_VERSION)
-READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
-READLINE_SITE = $(GNU_MIRROR)/readline
-
-$(DL_DIR)/$(READLINE_SOURCE):
-	$(download) $(READLINE_SITE)/$(READLINE_SOURCE)
-
-READLINE_CONF_OPTS = \
-	--datarootdir=$(REMOVE_datarootdir)
-
-readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(PKG_DIR)
-	$(UNTAR)/$(PKG_SOURCE)
-	$(CHDIR)/$(PKG_DIR); \
-		$(CONFIGURE); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(PKG_DIR)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 LIBZEN_VERSION = 0.4.38
 LIBZEN_DIR = ZenLib
 LIBZEN_SOURCE = libzen_$(LIBZEN_VERSION).tar.bz2
diff --git a/package/astra-sm/astra-sm.mk b/package/astra-sm/astra-sm.mk
new file mode 100644
index 00000000..1a589baf
--- /dev/null
+++ b/package/astra-sm/astra-sm.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# astra-sm
+#
+################################################################################
+
+ASTRA_SM_VERSION = git
+ASTRA_SM_DIR = astra-sm.$(ASTRA_SM_VERSION)
+ASTRA_SM_SOURCE = astra-sm.$(ASTRA_SM_VERSION)
+ASTRA_SM_SITE = https://gitlab.com/crazycat69
+
+ASTRA_SM_DEPENDENCIES = openssl
+
+ASTRA_SM_AUTORECONF = YES
+
+ASTRA_SM_CONF_OPTS = \
+	--without-lua
+
+define ASTRA_SM_PATCH_MAKEFILE
+	$(SED) 's:(CFLAGS):(CFLAGS_FOR_BUILD):' $(PKG_BUILD_DIR)/tools/Makefile.am
+endef
+ASTRA_SM_POST_PATCH_HOOKS = ASTRA_SM_PATCH_MAKEFILE
+
+astra-sm: | $(TARGET_DIR)
+	$(call autotools-package)
diff --git a/package/base-passwd/base-passwd.mk b/package/base-passwd/base-passwd.mk
new file mode 100644
index 00000000..e80a26d5
--- /dev/null
+++ b/package/base-passwd/base-passwd.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# base-passwd
+#
+################################################################################
+
+BASE_PASSWD_VERSION = 3.5.29
+BASE_PASSWD_DIR = base-passwd-$(BASE_PASSWD_VERSION)
+BASE_PASSWD_SOURCE = base-passwd_$(BASE_PASSWD_VERSION).tar.gz
+BASE_PASSWD_SITE = https://launchpad.net/debian/+archive/primary/+files
+
+define BASE_PASSWD_INSTALL_MASTER_FILES
+	$(INSTALL_DATA) -D $(PKG_BUILD_DIR)/group.master $(TARGET_datadir)/base-passwd/group.master
+	$(INSTALL_DATA) -D $(PKG_BUILD_DIR)/passwd.master $(TARGET_datadir)/base-passwd/passwd.master
+endef
+BASE_PASSWD_PRE_FOLLOWUP_HOOKS += BASE_PASSWD_INSTALL_MASTER_FILES
+
+base-passwd: | $(TARGET_DIR)
+	$(call autotools-package)
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
new file mode 100644
index 00000000..e0e3e08c
--- /dev/null
+++ b/package/readline/readline.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# readline
+#
+################################################################################
+
+READLINE_VERSION = 8.1
+READLINE_DIR = readline-$(READLINE_VERSION)
+READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
+READLINE_SITE = $(GNU_MIRROR)/readline
+
+READLINE_CONF_ENV = \
+	bash_cv_func_sigsetjmp=yes \
+	bash_cv_wcwidth_broken=no
+
+READLINE_CONF_OPTS = \
+	--datarootdir=$(REMOVE_datarootdir) \
+	--disable-install-examples
+
+readline: | $(TARGET_DIR)
+	$(call autotools-package)
diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk
new file mode 100644
index 00000000..f6f902f5
--- /dev/null
+++ b/package/shadow/shadow.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# shadow
+#
+################################################################################
+
+SHADOW_VERSION = 4.8.1
+SHADOW_DIR = shadow-$(SHADOW_VERSION)
+SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz
+SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION)
+
+SHADOW_CONF_OPTS = \
+	--prefix=$(base_prefix) \
+	--datarootdir=$(REMOVE_base_datarootdir)
+
+define SHADOW_PATCH_USERADD
+	$(SED) 's|SHELL=.*|SHELL=/bin/sh|' $(TARGET_sysconfdir)/default/useradd
+endef
+SHADOW_TARGET_FINALIZE_HOOKS += SHADOW_PATCH_USERADD
+
+shadow: | $(TARGET_DIR)
+	$(call autotools-package)