diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index e5ec8cce2f..b093e9f064 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -186,7 +186,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 		3com atheros813x ar81xx attansic_l1 attansic_l2 broadcom440x
 		broadcom570x dec21xxx ipro100 ipro1000 jmicron2x0 marvell_yukon nforce
 		pcnet rtl8139 rtl81xx sis19x syskonnect via_rhine vt612x
-	}@ # x86_64
+	}@ # x86,x86_64
 
 	etherpci pegasus sis900 usb_davicom usb_asix usb_ecm wb840
 
@@ -204,8 +204,8 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ;
 SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
 	ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
-	ide@ide scsi config_manager agp_gart@x86,x86_64 usb firewire@x86 acpi@x86
-	virtio random
+	ide@ide scsi config_manager agp_gart@x86,x86_64 usb firewire@x86
+	acpi@x86,x86_64	virtio random
 ] ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs
 	nfs4 attribute_overlay write_overlay ntfs packagefs reiserfs@x86 udf
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 76226b46b2..26c6f629d8 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -242,7 +242,7 @@ AddFilesToPackage data KeyboardLayouts ThinkPad
 
 # boot module links
 AddBootModuleSymlinksToPackage
-	acpi@x86 ata@ata pci isa@x86 config_manager dpc
+	acpi@x86,x86_64 ata@ata pci isa@x86,x86_64 config_manager dpc
 	ide@ide scsi usb
 	openpic@ppc
 	ata_adapter@ata ide_adapter@ide locked_pool scsi_periph
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index b982eb4585..0f092508d0 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -26,7 +26,7 @@ for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
 
 # modules
 AddFilesToPackage add-ons kernel bus_managers : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ;
-AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86 ;
+AddFilesToPackage add-ons kernel busses agp_gart : <agp_gart>intel@x86,x86_64 ;
 
 if $(HAIKU_ATA_STACK) = 1 {
 	AddFilesToPackage add-ons kernel busses ata
@@ -206,7 +206,7 @@ AddFilesToPackage data KeyboardLayouts ThinkPad
 
 # boot module links
 AddBootModuleSymlinksToPackage
-	acpi@x86 ata@ata pci isa@x86 config_manager dpc
+	acpi@x86,x86_64 ata@ata pci isa@x86,x86_64 config_manager dpc
 	ide@ide scsi usb
 	openpic@ppc
 	ata_adapter@ata ide_adapter@ide locked_pool scsi_periph
diff --git a/src/add-ons/kernel/bus_managers/acpi/Jamfile b/src/add-ons/kernel/bus_managers/acpi/Jamfile
index 034ea23739..efee40f5eb 100644
--- a/src/add-ons/kernel/bus_managers/acpi/Jamfile
+++ b/src/add-ons/kernel/bus_managers/acpi/Jamfile
@@ -4,7 +4,7 @@ UsePrivateKernelHeaders ;
 SubDirHdrs [ FDirName $(SUBDIR) acpica include ] ;
 SubDirHdrs [ FDirName $(SUBDIR) acpica include platform ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) pci ] ;
-SubDirCcFlags -fno-pic -D_KERNEL_MODE ;
+SubDirCcFlags -D_KERNEL_MODE ;
 
 
 local common_src =
diff --git a/src/add-ons/kernel/bus_managers/acpi/Module.cpp b/src/add-ons/kernel/bus_managers/acpi/Module.cpp
index 6b37c47275..aa64bdf224 100644
--- a/src/add-ons/kernel/bus_managers/acpi/Module.cpp
+++ b/src/add-ons/kernel/bus_managers/acpi/Module.cpp
@@ -233,7 +233,9 @@ module_info* modules[] = {
 	(module_info*)&sACPIRootModule,
 	(module_info*)&acpi_ns_dump_module,
 	(module_info*)&gACPIDeviceModule,
+#ifndef __x86_64__
 	(module_info*)&embedded_controller_driver_module,
 	(module_info*)&embedded_controller_device_module,
+#endif
 	NULL
 };