diff --git a/Jamfile b/Jamfile
index 86398a0f14..b066652a87 100644
--- a/Jamfile
+++ b/Jamfile
@@ -116,7 +116,6 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuImage ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) images NetBootArchive ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) images FloppyBootImage ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) images CDBootImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) images CDBootPPCImage ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuCD ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) images AnybootImage ] ;
 
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 899a062b88..9f4104da8b 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -56,16 +56,6 @@ HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME)
 HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME)
 	= system ;
 
-# boot CD for PPC image
-HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME = haiku-boot-cd-ppc-container ;
-HAIKU_CONTAINER_GRIST on $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME)
-	= CDBootPPCImage ;
-# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
-HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME)
-	= HAIKU_CD_BOOT_PPC_IMAGE_INSTALL_TARGETS ;
-HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME)
-	= system ;
-
 # Haiku image/install defaults
 HAIKU_DEFAULT_IMAGE_NAME = haiku.image ;
 HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ;
diff --git a/build/jam/images/CDBootImage b/build/jam/images/CDBootImage
index 381434b976..26ff0f98db 100644
--- a/build/jam/images/CDBootImage
+++ b/build/jam/images/CDBootImage
@@ -11,14 +11,27 @@ MakeLocate $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_OUTPUT_DIR) ;
 # the pseudo target all archive contents is attached to
 NotFile $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME) ;
 
-# extra files to put on the boot iso
+# common extra files to put on the boot iso
 local extras = README.html ;
-SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
 
-BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) : $(extras) ;
+if $(TARGET_ARCH) = ppc {
+	local elfloader = boot_loader_openfirmware ;
+	local coffloader = boot_loader_openfirmware_coff ;
 
+	# OpenFirmware / Mac boot support files:
+	# CHRP script
+	local chrpscript = ofboot.chrp ;
+	# HFS creator and application type mapping for mkisofs
+	local hfsmaps = hfs.map ;
+
+	SEARCH on $(chrpscript) $(hfsmaps) $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
+
+	BuildCDBootPPCImage $(HAIKU_CD_BOOT_IMAGE) : $(hfsmaps) : $(elfloader) : $(coffloader) : $(chrpscript) : $(extras) ;
+} else {
+	SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
+
+	BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) : $(extras) ;
+}
 
 NotFile haiku-boot-cd ;
 Depends haiku-boot-cd : $(HAIKU_CD_BOOT_IMAGE) ;
-
-
diff --git a/build/jam/images/CDBootPPCImage b/build/jam/images/CDBootPPCImage
deleted file mode 100644
index d9c2738937..0000000000
--- a/build/jam/images/CDBootPPCImage
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file defines what ends up in the CD boot image and it executes the
-# rules building the image.
-
-#HAIKU_BOOT_FLOPPY = haiku-boot-floppy.image ;
-#MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
-
-# CD image target
-HAIKU_CD_BOOT_PPC_IMAGE = haiku-boot-cd-ppc.iso ;
-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 chrpscript = ofboot.chrp ;
-
-# 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 $(chrpscript) $(hfsmaps) $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
-
-
-
-BuildCDBootPPCImage $(HAIKU_CD_BOOT_PPC_IMAGE) : $(hfsmaps) : $(elfloader) : $(coffloader) : $(chrpscript) : $(extras) ;
-
-
-NotFile haiku-boot-cd-ppc ;
-Depends haiku-boot-cd-ppc : $(HAIKU_CD_BOOT_PPC_IMAGE) ;
-
-