diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index b25e7f2c07..008ccb9850 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -98,9 +98,9 @@ BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900
 	via-rhine wb840 net_stack vlance
 	$(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x
 ;
-BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button ;
+#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 
-	$(X86_ONLY)acpi $(X86_ONLY)agp usb
+	$(X86_ONLY)agp usb
 ;
 BEOS_ADD_ONS_FILESYSTEMS = bfs dos iso9660 ;
 
@@ -135,7 +135,7 @@ AddDriversToHaikuImage graphics		: $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
 AddDriversToHaikuImage input		: ps2_hid usb_hid ;
 AddDriversToHaikuImage misc			: <driver>poke ;
 AddDriversToHaikuImage net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
-AddDriversToHaikuImage power		: $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
+#AddDriversToHaikuImage power		: $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
 
 # kernel
 AddFilesToHaikuImage beos system : kernel_$(TARGET_ARCH) ;
@@ -239,7 +239,7 @@ AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
 AddFilesToHaikuImage beos system : zbeos ;
 
 # boot module links
-AddBootModuleSymlinks $(X86_ONLY)acpi config_manager bfs block_io fast_log generic_ide_pci
+AddBootModuleSymlinks config_manager bfs block_io fast_log generic_ide_pci
 	$(X86_ONLY)isa ide ide_adapter $(X86_ONLY)ide_isa intel locked_pool
 	$(PPC_ONLY)openpic pci scsi scsi_cd scsi_dsk scsi_periph
 	silicon_image_3112