diff --git a/lfs/cdrom b/lfs/cdrom
index cb04a0fb7..b00e4a54e 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -60,9 +60,11 @@ ifeq "$(EFI)" "1"
 endif
 
 HAS_MEMTEST = 0
+HAS_IPXE = 0
 
 ifeq "$(BUILD_PLATFORM)" "x86"
 	HAS_MEMTEST = 1
+	HAS_IPXE = 1
 endif
 
 ###############################################################################
@@ -122,7 +124,6 @@ ifneq "$(BUILD_ARCH)" "armv5tel"
 	cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
 	dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
 	cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
-	cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
 	cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
 
 ifeq "$(HAS_MEMTEST)" "1"
@@ -130,6 +131,10 @@ ifeq "$(HAS_MEMTEST)" "1"
 	cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
 endif
 
+ifeq "$(HAS_IPXE)" "1"
+	cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
+endif
+
 ifeq "$(EFI)" "1"
 	# Generate embedded GRUB configuration
 	sed -e "s/NAME/$(NAME)/g" -e "s/VERSION/$(VERSION)/g" -e "s/ARCH/$(BUILD_ARCH)/g" \