diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 250d582e3b..f4d1b649f5 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -30,7 +30,7 @@ BEOS_BIN = "[" addattr alert arp base64 basename bc beep bootman bzip2 cal cat
 	csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
 	draggers driveinfo dstcheck du echo eject env error expand expr
 	expr factor false fdinfo ffm find finddir fmt fold fortune frcode ftp ftpd
-	funzip fwcontrol
+	funzip #fwcontrol
 	gawk $(X86_ONLY)gdb grep groups gzip gzexe hd head hey hostname id ident
 	ideinfo idestatus ifconfig <bin>install installsound iroster isvolume join
 	keymap kill less lessecho lesskey link listarea listattr listdev listimage
@@ -133,7 +133,7 @@ BEOS_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com etherpci $(X86_ONLY)ipro1000
 ;
 #BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button ;
 BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi
-	config_manager agp_gart usb firewire
+	config_manager agp_gart usb #firewire
 ;
 BEOS_ADD_ONS_FILE_SYSTEMS = bfs fat iso9660 ;
 #cdda googlefs nfs $(GPL_ONLY)ntfs ;
@@ -171,7 +171,7 @@ AddDriversToHaikuImage				: console dprintf $(X86_ONLY)keyboard null
 									  random <driver>tty zero ;
 AddDriversToHaikuImage audio hmulti	: $(BEOS_ADD_ONS_DRIVERS_AUDIO) ;
 AddDriversToHaikuImage midi			: $(BEOS_ADD_ONS_DRIVERS_MIDI) ;
-AddDriversToHaikuImage bus			: fw_raw usb_raw ;
+AddDriversToHaikuImage bus			: usb_raw ; # fw_raw
 AddDriversToHaikuImage disk scsi	: scsi_cd scsi_dsk ;
 AddDriversToHaikuImage disk usb		: usb_disk ;
 AddDriversToHaikuImage disk virtual	: nbd ;