diff --git a/lfs/cdrom b/lfs/cdrom
index 7fa3999c2..faaa3dff1 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -56,14 +56,6 @@ ISO_ARGS = -J -r -v \
 
 ISOHYBRID_ARGS =
 
-ifeq "$(EFI)" "1"
-	ISO_ARGS += \
-		-eltorito-alt-boot \
-		-e boot/isolinux/efiboot.img
-
-	ISOHYBRID_ARGS += --uefi
-endif
-
 ifeq "$(HAS_ISOLINUX)" "1"
 	ISO_ARGS += \
 		-no-emul-boot \
@@ -73,6 +65,14 @@ ifeq "$(HAS_ISOLINUX)" "1"
 		-c boot/isolinux/boot.catalog
 endif
 
+ifeq "$(EFI)" "1"
+	ISO_ARGS += \
+		-eltorito-alt-boot \
+		-e boot/isolinux/efiboot.img
+
+	ISOHYBRID_ARGS += --uefi
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################