diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 7d170e5f32..ef27d45c8c 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -193,7 +193,7 @@ AddFilesToHaikuImage system add-ons kernel generic
 	: $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401
 		scsi_periph ;
 AddFilesToHaikuImage system add-ons kernel partitioning_systems
-	: intel session ;
+	: amiga_rdb apple efi_gpt intel session ;
 AddFilesToHaikuImage system add-ons kernel interrupt_controllers
 	: $(PPC_ONLY)openpic ;
 
@@ -369,7 +369,7 @@ SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
 etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
 AddFilesToHaikuImage system etc : $(etcFiles) ;
 
-SEARCH on <bash_completion>subversion = 
+SEARCH on <bash_completion>subversion =
 	[ FDirName $(HAIKU_TOP) data etc bash_completion.d ] ;
 AddFilesToHaikuImage system etc bash_completion.d : <bash_completion>subversion ;
 
diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile
index 7987966f54..07cf0a58d0 100644
--- a/src/system/boot/loader/Jamfile
+++ b/src/system/boot/loader/Jamfile
@@ -13,20 +13,36 @@ UsePrivateHeaders shared storage ;
 	local defines =
 		_BOOT_MODE
 		BOOT_ARCH=\\\"$(TARGET_ARCH)\\\"
+		KMESSAGE_CONTAINER_ONLY
 
-		BOOT_SUPPORT_PARTITION_AMIGA
-		BOOT_SUPPORT_PARTITION_APPLE
-		BOOT_SUPPORT_PARTITION_EFI
 		BOOT_SUPPORT_PARTITION_INTEL
 
 		BOOT_SUPPORT_FILE_SYSTEM_BFS
-		BOOT_SUPPORT_FILE_SYSTEM_FAT
-		BOOT_SUPPORT_FILE_SYSTEM_AMIGA_FFS
 		BOOT_SUPPORT_FILE_SYSTEM_TARFS
-
-		KMESSAGE_CONTAINER_ONLY
 	;
 
+	# Add architecture specific partition/file system modules
+
+	switch $(TARGET_ARCH) {
+		case "ppc" :
+		{
+			defines +=
+				BOOT_SUPPORT_PARTITION_AMIGA
+				BOOT_SUPPORT_PARTITION_APPLE
+
+				BOOT_SUPPORT_FILE_SYSTEM_AMIGA_FFS
+			;
+		}
+		case "x86" :
+		{
+			defines +=
+				BOOT_SUPPORT_PARTITION_EFI
+
+				BOOT_SUPPORT_FILE_SYSTEM_FAT
+			;
+		}
+	}
+
 	defines = [ FDefines $(defines) ] ;
 	SubDirCcFlags $(defines) -Wall -Wno-multichar ;
 	SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti ;