diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index 03c2382c73..971e142f37 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -218,7 +218,7 @@ SYSTEM_ADD_ONS_DRIVERS_POWER += [ FFilterByBuildFeatures
 
 SYSTEM_ADD_ONS_FILE_SYSTEMS +=
 	cdda
-	googlefs
+	#googlefs
 	nfs nfs4
 ;
 
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index c1d354d33f..c34a5bb60b 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -52,7 +52,7 @@ AddFilesToPackage add-ons kernel generic
 	: ata_adapter@ata bios@x86,x86_64 dpc ide_adapter@ide
 		locked_pool mpu401 scsi_periph <module>tty ;
 AddFilesToPackage add-ons kernel partitioning_systems
-	: amiga_rdb apple efi_gpt intel session ;
+	: amiga_rdb@m68k apple@ppc efi_gpt intel session ;
 AddFilesToPackage add-ons kernel interrupt_controllers : openpic@ppc ;
 AddFilesToPackage add-ons kernel power cpufreq : intel_pstates@x86,x86_64 ;
 AddFilesToPackage add-ons kernel power cpuidle : intel_cstates@x86,x86_64 ;
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index a0252210e5..9a3c9c30ee 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -43,7 +43,7 @@ AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci ;
 AddFilesToPackage add-ons kernel busses virtio : virtio_pci ;
 AddFilesToPackage add-ons kernel console : vga_text ;
 AddFilesToPackage add-ons kernel debugger
-	: <kdebug>demangle <kdebug>disasm@x86 <kdebug>hangman
+	: <kdebug>demangle <kdebug>disasm@x86 #<kdebug>hangman
 	  <kdebug>invalidate_on_exit <kdebug>usb_keyboard
 	  <kdebug>run_on_exit ;
 AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
@@ -51,7 +51,7 @@ AddFilesToPackage add-ons kernel generic
 	: ata_adapter@ata bios@x86,x86_64 dpc ide_adapter@ide
 		locked_pool mpu401 scsi_periph <module>tty ;
 AddFilesToPackage add-ons kernel partitioning_systems
-	: amiga_rdb apple efi_gpt intel session ;
+	: amiga_rdb@m68k apple@ppc efi_gpt intel session ;
 AddFilesToPackage add-ons kernel interrupt_controllers : openpic@ppc ;
 AddFilesToPackage add-ons kernel power cpufreq : intel_pstates@x86,x86_64 ;
 AddFilesToPackage add-ons kernel power cpuidle : intel_cstates@x86,x86_64 ;