diff --git a/features.in/efi/config.mk b/features.in/efi/config.mk
index 8fdf46b3..4995d38a 100644
--- a/features.in/efi/config.mk
+++ b/features.in/efi/config.mk
@@ -7,7 +7,8 @@ use/efi:
 	@$(call set,MKI_VER_MINIMAL,0.2.5)	# see #28219
 	@$(call add,THE_LISTS,$(EFI_LISTS))
 	@$(call add,RESCUE_LISTS,$(EFI_LISTS))
-	@$(call add,RESCUE_PACKAGES,refind efi-shell)
+	@$(call add,THE_PACKAGES,$$(EFI_SHELL))
+	@$(call add,RESCUE_PACKAGES,refind $$(EFI_SHELL))
 	@$(call add,INSTALL2_PACKAGES,dosfstools)
 	@$(call try,EFI_BOOTLOADER,elilo)	# default one
 
@@ -16,9 +17,13 @@ use/efi/refind: use/efi
 
 use/efi/signed: use/efi
 	@$(call set,EFI_CERT,altlinux)
-	@$(call add,RESCUE_PACKAGES,refind-signed efi-shell-signed)
+	@$(call set,EFI_SHELL,efi-shell-signed)	# even more useful
+	@$(call add,RESCUE_PACKAGES,refind-signed)
 	@$(call add,RESCUE_PACKAGES,openssl sbsigntools)
 
+use/efi/shell: use/efi
+	@$(call set,EFI_SHELL,efi-shell)
+
 use/efi/debug: use/efi
 	@$(call add,STAGE2_PACKAGES,efibootmgr gdisk)
 	@$(call set,KFLAVOURS,led-ws)
@@ -26,6 +31,6 @@ use/efi/debug: use/efi
 else
 
 # ignore on an unsupported target arch but make it hybrid at least
-use/efi use/efi/refind use/efi/signed use/efi/debug: use/isohybrid
+use/efi use/efi/refind use/efi/signed use/efi/shell use/efi/debug: use/isohybrid
 
 endif