diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 970f524fec..1768f848f4 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -95,7 +95,7 @@ BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon.driver $(X86_ONLY)nv.driver
 ;
 BEOS_ADD_ONS_DRIVERS_MIDI = emuxki ;
 BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900
-	etherpci via-rhine wb840 net_stack
+	via-rhine wb840 net_stack
 	$(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x
 ;
 BEOS_ADD_ONS_DRIVERS_ACPI = $(X86_ONLY)acpi_button $(X86_ONLY)acpi_ns_dump ;
@@ -133,7 +133,7 @@ AddDriversToHaikuImage bus		: usb_raw ;
 AddDriversToHaikuImage disk scsi	: scsi_cd scsi_dsk ;
 AddDriversToHaikuImage graphics		: $(BEOS_ADD_ONS_DRIVERS_GRAPHICS) ;
 AddDriversToHaikuImage input		: ps2_hid usb_hid ;
-AddDriversToHaikuImage misc			: <driver>config <driver>poke ;
+AddDriversToHaikuImage misc			: <driver>poke ;
 AddDriversToHaikuImage net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;
 AddDriversToHaikuImage power		: $(BEOS_ADD_ONS_DRIVERS_ACPI) ;
 
@@ -239,7 +239,7 @@ AddFilesToHaikuImage home config settings : <keymap>US-International : Key_map ;
 AddFilesToHaikuImage beos system : zbeos ;
 
 # boot module links
-AddBootModuleSymlinks config_manager bfs block_io fast_log generic_ide_pci
+AddBootModuleSymlinks $(X86_ONLY)acpi 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
diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_module.c b/src/add-ons/kernel/bus_managers/acpi/acpi_module.c
index a236cab2c2..afb4e14655 100644
--- a/src/add-ons/kernel/bus_managers/acpi/acpi_module.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpi_module.c
@@ -76,7 +76,6 @@ acpi_enumerate_child_devices(device_node_handle node, const char *root)
 		switch (type) {
 		case ACPI_TYPE_DEVICE: {
 			char hid[9] = "";
-			get_device_hid(result, hid);
 			device_attr attrs[] = {
 				// info about device
 				{ B_DRIVER_MODULE, B_STRING_TYPE, { string: ACPI_DEVICE_MODULE_NAME }},
@@ -94,6 +93,7 @@ acpi_enumerate_child_devices(device_node_handle node, const char *root)
 				{ B_DRIVER_BUS, B_STRING_TYPE, { string: "apci" }},
 				{ NULL }
 			};
+			get_device_hid(result, hid);
 			
 			if (gDeviceManager->register_device(node, attrs, NULL, &deviceNode) == B_OK)
 				acpi_enumerate_child_devices(deviceNode, result);