diff --git a/features.in/Makefile b/features.in/Makefile
index fcef9ee7..df8115f4 100644
--- a/features.in/Makefile
+++ b/features.in/Makefile
@@ -65,11 +65,9 @@ $(FEATURES):
 	for sub in / $(SUBPROFILES); do \
 		dirtags=; \
 		if [ "$$sub" = / ]; then \
-			parts=lib; \
 			srcdirs="."; \
 			dst="."; \
 		else \
-			parts=; \
 			src="$${sub%/*}"; \
 			dst="$${sub#*/}"; \
 			srcdirs=; \
@@ -92,7 +90,7 @@ $(FEATURES):
 		for srcdir in $$srcdirs; do \
 			[ -d "$$srcdir" ] || continue; \
 			pushd "$$srcdir" >&/dev/null; \
-			for part in $$parts {image-,}scripts.d; do \
+			for part in lib {image-,}scripts.d; do \
 				destdir="$(BUILDDIR)/$$dst/$$part"; \
 				[ -d "$$destdir" ] || continue; \
 				if [ "$$sub" = / -a -d "$$part" ]; then \
diff --git a/sub.in/main/Makefile b/sub.in/main/Makefile
index d1246986..e553c2c6 100644
--- a/sub.in/main/Makefile
+++ b/sub.in/main/Makefile
@@ -28,6 +28,8 @@ IMAGE_PACKAGES = $(call map,list, \
 		 $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \
 		 $(THE_PACKAGES) $(BASE_PACKAGES) $(MAIN_PACKAGES)
 
+-include lib/*.mk
+
 MKI_DESTDIR = ALTLinux/RPMS.main
 MKI_PACK_RESULTS = data
 
diff --git a/sub.in/stage1/Makefile b/sub.in/stage1/Makefile
index ccbcf685..8e94cb77 100644
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -41,6 +41,8 @@ CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES)
 # pass for use/stage2
 GLOBAL_SQUASHFS := $(SQUASHFS)
 
+-include lib/*.mk
+
 # scripts prepare bootloader configuration, too
 # NB: we pass tested squashfs options for ../stage2/Makefile to include
 all: | debug prepare-workdir copy-tree run-scripts $(BUILD_PROPAGATOR) \
diff --git a/sub.in/stage2/Makefile b/sub.in/stage2/Makefile
index 07924841..d7d7e558 100644
--- a/sub.in/stage2/Makefile
+++ b/sub.in/stage2/Makefile
@@ -36,6 +36,8 @@ IMAGE_PACKAGES_REGEXP += $(call kpackages, \
 			 $(STAGE1_KMODULES) $(STAGE2_KMODULES), \
 			 $(STAGE1_KFLAVOUR))
 
+-include lib/*.mk
+
 # see also scripts.d/99-elf-stats
 ifdef GLOBAL_SQUASHFS_SORT
 ifeq (tight,$(SQUASHFS))