diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index f79ee3e0eb..51ae5dd2c4 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -273,7 +273,6 @@ rule KernelArchitectureSetup architecture
 		case x86 :
 			HAIKU_KERNEL_PLATFORM ?= bios_ia32 ;
 			HAIKU_BOOT_TARGETS += bios_ia32 efi pxe_ia32 ;
-			HAIKU_ANYBOOT_LEGACY = 1 ;
 
 			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
 			# offset in floppy image (>= sizeof(haiku_loader))
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 80373dc141..5bb656c5a2 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1589,7 +1589,7 @@ actions BuildFloppyBootImageFixupM68K
 
 #pragma mark - CD Boot Image rules
 
-rule BuildCDBootImage image : bootfloppy : bootefi : extrafiles
+rule BuildCDBootImageEFI image : bootfloppy : bootefi : extrafiles
 {
 	Depends $(image) : $(bootfloppy) ;
 	Depends $(image) : $(bootefi) ;
@@ -1602,21 +1602,11 @@ rule BuildCDBootImage image : bootfloppy : bootefi : extrafiles
 		VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ;
 	}
 
-	if $(HAIKU_ANYBOOT_LEGACY) = 1 {
-		BuildCDBootImageMBR $(image) : $(bootfloppy) $(extrafiles) ;
-	} else {
-		BOOTEFI on $(image) = $(bootefi) ;
-		BuildCDBootImageEFI $(image) : $(bootfloppy) $(bootefi) $(extrafiles) ;
-	}
+	BOOTEFI on $(image) = $(bootefi) ;
+	BuildCDBootImageEFI1 $(image) : $(bootfloppy) $(bootefi) $(extrafiles) ;
 }
 
-actions BuildCDBootImageMBR
-{
-	$(RM) $(<)
-	xorriso -as mkisofs -b $(BOOTIMG) -r -J -V $(VOLID) -o $(<) $(>[1]) $(>[2-])
-}
-
-actions BuildCDBootImageEFI
+actions BuildCDBootImageEFI1
 {
 	$(RM) $(<)
 	xorriso -as mkisofs -b $(BOOTIMG) -eltorito-alt-boot -no-emul-boot -e $(BOOTEFI) \
diff --git a/build/jam/images/AnybootImage b/build/jam/images/AnybootImage
index 5645a8ea0c..0dcf640996 100644
--- a/build/jam/images/AnybootImage
+++ b/build/jam/images/AnybootImage
@@ -4,21 +4,6 @@ HAIKU_ANYBOOT_DIR ?= $(HAIKU_DEFAULT_ANYBOOT_DIR) ;
 HAIKU_ANYBOOT = $(HAIKU_ANYBOOT_NAME) ;
 HAIKU_ANYBOOT_LABEL ?= $(HAIKU_DEFAULT_ANYBOOT_LABEL) ;
 
-rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile {
-	local anyboot = <build>anyboot ;
-
-	Depends $(anybootImage) : $(anyboot) ;
-	Depends $(anybootImage) : $(isoPart) ;
-	Depends $(anybootImage) : $(mbrPart) ;
-	Depends $(anybootImage) : $(imageFile) ;
-
-	BuildAnybootImage1 $(anybootImage) : $(anyboot) $(mbrPart) $(isoPart) $(imageFile) ;
-}
-
-actions BuildAnybootImage1 {
-	$(2[1]) -b $(2[2]) $(2[3]) $(2[4]) $(1)
-}
-
 rule BuildAnybootImageEfi anybootImage : mbrPart : efiPart : isoPart : imageFile {
 	local anyboot = <build>anyboot ;
 
@@ -55,9 +40,6 @@ for platform in [ MultiBootSubDirSetup ] {
 			BuildAnybootImageEfi $(HAIKU_ANYBOOT) : $(baseMBR)
 				: $(efiPartition) : $(HAIKU_CD_BOOT_IMAGE)
 				: $(HAIKU_IMAGE_NAME) ;
-		} else if $(HAIKU_ANYBOOT_LEGACY) = 1 {
-			BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR)
-				: $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_IMAGE_NAME) ;
 		}
 	}
 }
diff --git a/build/jam/images/CDBootImage b/build/jam/images/CDBootImage
index dbe61ff690..569180e1d9 100644
--- a/build/jam/images/CDBootImage
+++ b/build/jam/images/CDBootImage
@@ -38,12 +38,8 @@ if $(TARGET_ARCH) = ppc {
 				MakeLocateDebug $(efiPartition) : system boot ;
 				BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ;
 
-				BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY)
+				BuildCDBootImageEFI $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY)
 					: $(efiPartition) : $(extras) ;
-
-			} else if $(HAIKU_ANYBOOT_LEGACY) = 1 {
-				BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) : 
-					: $(extras) ;
 			}
 		}
 	}