diff --git a/features.in/luks/config.mk b/features.in/luks/config.mk
index 3255f852..69f56da9 100644
--- a/features.in/luks/config.mk
+++ b/features.in/luks/config.mk
@@ -3,6 +3,12 @@ LUKS_LISTS := $(call tags,security luks)
 use/luks:
 	@$(call add_feature)
 	@$(call add,BASE_PACKAGES,make-initrd-luks)
-	@$(call add,BASE_PACKAGES,alterator-luks)
 	@$(call add,THE_LISTS,$(LUKS_LISTS))
 	@$(call add,RESCUE_LISTS,$(LUKS_LISTS))
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call add,BASE_PACKAGES,alterator-luks)
+endif
+
+use/luks/touchscreen: use/luks use/plymouth/base
+	@$(call add,BASE_PACKAGES,unl0kr)
+	@$(call add,VM_INITRDMODULES,drivers/input/touchscreen)
diff --git a/features.in/luks/rootfs/image-scripts.d/10-luks b/features.in/luks/rootfs/image-scripts.d/10-luks
new file mode 100755
index 00000000..a600d866
--- /dev/null
+++ b/features.in/luks/rootfs/image-scripts.d/10-luks
@@ -0,0 +1,10 @@
+#!/bin/sh -efu
+
+CONFIG="/etc/initrd.mk"
+if [ -f "$CONFIG" ]; then
+	grep -qw luks "$CONFIG" || echo 'FEATURES += luks' >> "$CONFIG"
+	if rpm -q unl0kr; then
+		grep -qw luks-unl0kr "$CONFIG" ||
+		    echo 'FEATURES += luks-unl0kr' >> "$CONFIG"
+	fi
+fi