diff --git a/distro.mk b/distro.mk
index 48f157bb..897d6c05 100644
--- a/distro.mk
+++ b/distro.mk
@@ -23,7 +23,7 @@ include libdistro.mk
 # bootloader test target; requires recent mkimage to build
 distro/syslinux: distro/.init distro/.branding sub/stage1 \
 	use/syslinux use/syslinux/localboot.cfg \
-	use/syslinux/ui-vesamenu use/hdt use/memtest
+	use/syslinux/ui-vesamenu use/hdt use/memtest use/dos
 
 #  $(VAR) will be substituted before writing them to $(CONFIG);
 # $$(VAR) will remain unsubstituted util $(CONFIG) is included
diff --git a/features.in/installer/config.mk b/features.in/installer/config.mk
index ad3a3a92..00295795 100644
--- a/features.in/installer/config.mk
+++ b/features.in/installer/config.mk
@@ -1,4 +1,5 @@
 use/installer: sub/install2 use/syslinux/install2.cfg
+	@$(call add,FEATURES,installer)
 	@$(call set,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2)
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
 	@$(call add,MAIN_PACKAGES,branding-$$(BRANDING)-release)
diff --git a/sub.in/stage1/scripts.d/01-initfs b/features.in/installer/stage1/scripts.d/01-initfs
similarity index 100%
rename from sub.in/stage1/scripts.d/01-initfs
rename to features.in/installer/stage1/scripts.d/01-initfs
diff --git a/sub.in/stage1/scripts.d/02-kdefault b/features.in/installer/stage1/scripts.d/02-kdefault
similarity index 100%
rename from sub.in/stage1/scripts.d/02-kdefault
rename to features.in/installer/stage1/scripts.d/02-kdefault
diff --git a/sub.in/stage1/scripts.d/03-test-kernel b/features.in/installer/stage1/scripts.d/03-test-kernel
similarity index 100%
rename from sub.in/stage1/scripts.d/03-test-kernel
rename to features.in/installer/stage1/scripts.d/03-test-kernel
diff --git a/sub.in/stage1/Makefile b/sub.in/stage1/Makefile
index 7932026f..9b406ec5 100644
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -13,8 +13,7 @@ $(error BOOTLOADER not defined)
 endif
 
 MKI_PACK_RESULTS = data
-# FIXME: un-hardwire description
-PROPAGATOR_VERSION = mkimage-profiles 2.0
+PROPAGATOR_VERSION = ALT Linux
 PROPAGATOR_MAR_MODULES = ./modules
 PROPAGATOR_INITFS = ./initfs
 COPY_TREE = ./files
diff --git a/sub.in/stage1/scripts.d/.gitignore b/sub.in/stage1/scripts.d/.gitignore
new file mode 100644
index 00000000..e69de29b