diff --git a/features.in/luks/config.mk b/features.in/luks/config.mk
index 6524b3a4..37abee4a 100644
--- a/features.in/luks/config.mk
+++ b/features.in/luks/config.mk
@@ -1,5 +1,7 @@
 LUKS_LISTS := $(call tags,security luks)
 
 use/luks:
+	@$(call add_feature)
+	@$(call add,BASE_PACKAGES,make-initrd-luks)
 	@$(call add,THE_LISTS,$(LUKS_LISTS))
 	@$(call add,RESCUE_LISTS,$(LUKS_LISTS))
diff --git a/features.in/luks/install2/image-scripts.d/50-check-luks b/features.in/luks/install2/image-scripts.d/50-check-luks
new file mode 100755
index 00000000..a8042510
--- /dev/null
+++ b/features.in/luks/install2/image-scripts.d/50-check-luks
@@ -0,0 +1,9 @@
+#!/bin/sh
+# let's check if support is there until installer-steps are dynamic
+
+CONFIG="/usr/share/install2/installer-steps"
+
+if ! grep -q '^luks$' "$CONFIG"; then
+	PKG="$(rpm -qf "$CONFIG")"
+	echo "** warning: luks step missing in ${PKG:-$CONFIG}" >&2
+fi
diff --git a/features.in/luks/stage1/scripts.d/11-initrd-luks b/features.in/luks/stage1/scripts.d/11-initrd-luks
deleted file mode 100755
index 49aa7e3d..00000000
--- a/features.in/luks/stage1/scripts.d/11-initrd-luks
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo 'FEATURES += luks' >> /etc/initrd.mk