diff --git a/build/jam/CDBootPPCImage b/build/jam/CDBootPPCImage
index 0fabcd15ec..d5acf3e81c 100644
--- a/build/jam/CDBootPPCImage
+++ b/build/jam/CDBootPPCImage
@@ -11,20 +11,25 @@ MakeLocate $(HAIKU_CD_BOOT_PPC_IMAGE) : $(HAIKU_OUTPUT_DIR) ;
 # the pseudo target all archive contents is attached to
 NotFile $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME) ;
 
+local elfloader = boot_loader_openfirmware ;
+local coffloader = boot_loader_openfirmware_coff ;
+
+# OpenFirmware / Mac boot support files:
+
+# CHRP script
+local chrpboot = ofboot.b ;
+
+# HFS creator and application type mapping for mkisofs
+local hfsmaps = hfs.map ;
+
 # extra files to put on the boot iso
 local extras = README.html ;
-SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
 
-local chrpboot = ofboot.b ;
-SEARCH on $(chrpboot) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
-
-local hfsmaps = hfs.map ;
-SEARCH on $(hfsmaps) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
+SEARCH on $(chrpboot) $(hfsmaps) $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
 
 
 
-
-BuildCDBootPPCImage $(HAIKU_CD_BOOT_PPC_IMAGE) : $(hfsmaps) : boot_loader_openfirmware : $(chrpboot) : $(extras) ;
+BuildCDBootPPCImage $(HAIKU_CD_BOOT_PPC_IMAGE) : $(hfsmaps) : $(elfloader) : $(coffloader) : $(chrpboot) : $(extras) ;
 
 
 NotFile haiku-boot-cd-ppc ;
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index cda219bbbd..a285e8c998 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1068,15 +1068,16 @@ actions BuildCDBootImage1
 
 #pragma mark - CD Boot PPC Image rules
 
-rule BuildCDBootPPCImage image : hfsmaps : bootloader : chrpscript : extrafiles
+rule BuildCDBootPPCImage image : hfsmaps : elfloader : coffloader : chrpscript : extrafiles
 {
-	Depends $(image) : $(bootloader) ;
+	Depends $(image) : $(elfloader) ;
+	Depends $(image) : $(coffloader) ;
 	Depends $(image) : $(chrpscript) ;
 	Depends $(image) : $(extrafiles) ;
 	Depends $(image) : $(hfsmaps) ;
 	MAPS on $(image) = $(hfsmaps) ;
 
-	BuildCDBootPPCImage1 $(image) : $(bootloader) $(chrpscript) $(extrafiles) ;
+	BuildCDBootPPCImage1 $(image) : $(elfloaders) $(coffloader) $(chrpscript) $(extrafiles) ;
 }
 
 actions BuildCDBootPPCImage1 bind MAPS
@@ -1084,8 +1085,9 @@ actions BuildCDBootPPCImage1 bind MAPS
 	$(RM) $(<)
 	mkdir -p $(HAIKU_OUTPUT_DIR)/cd/ppc
 	cp $(>) $(HAIKU_OUTPUT_DIR)/cd/ppc/
-	cp $(>[2]) $(HAIKU_OUTPUT_DIR)/cd/ppc/bootinfo.txt
+	cp $(>[3]) $(HAIKU_OUTPUT_DIR)/cd/ppc/bootinfo.txt
 	cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.elf
+	cp $(>[2]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.xcf
 	#mkisofs -r -U -chrp-boot -V bootimg -o $(<) $(>[1]) $(>[2-])
 	#mkisofs -hfs -r -U -chrp-boot -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -prep-boot $(>[1]:D=) -o $(<) $(>[1]) $(>[2-])
 	#mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -r -o $(<) $(>[1]) $(>[2-]) $(HAIKU_OUTPUT_DIR)/cd
@@ -1093,7 +1095,7 @@ actions BuildCDBootPPCImage1 bind MAPS
 	#mkisofs -r -U -V bootimg -prep-boot $(>[1]:D=) -o $(<) $(>[1]) $(>[2-])
 	# $(HAIKU_OUTPUT_DIR)/cd
 	# -hfs -hfs-bless .
-	mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot ppc/$(>[1]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
+	mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
 	#$(RM) -R $(HAIKU_OUTPUT_DIR)/cd
 }