diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c
index a8eb8b41f..7ef6becad 100644
--- a/src/machine/m_at_socket4_5.c
+++ b/src/machine/m_at_socket4_5.c
@@ -120,7 +120,7 @@ machine_at_batman_init(const machine_t *model)
     return ret;
 }
 
-#if defined(DEV_BRANCH) && defined(USE_VECT486VL)
+#if defined(DEV_BRANCH) && defined(USE_DELLS4)
 int
 machine_at_dellxp60_init(const machine_t *model)
 {
@@ -132,9 +132,21 @@ machine_at_dellxp60_init(const machine_t *model)
     if (bios_only || !ret)
 	return ret;
 
-    machine_at_premiere_common_init(model, PCI_NO_IRQ_STEERING);
+    machine_at_common_init(model);
+    device_add(&ide_pci_2ch_device);
 
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SPECIAL, 0, 0, 0, 0);
+    pci_register_slot(0x06, PCI_CARD_NORMAL, 3, 2, 1, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430lx_device);
+    device_add(&keyboard_ps2_intel_ami_pci_device);
+    device_add(&sio_device);
+    device_add(&fdc37c665_device);
+    device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
@@ -150,9 +162,21 @@ machine_at_opti560l_init(const machine_t *model)
     if (bios_only || !ret)
 	return ret;
 
-    machine_at_premiere_common_init(model, PCI_NO_IRQ_STEERING);
+    machine_at_common_init(model);
+    device_add(&ide_pci_2ch_device);
 
+    pci_init(PCI_CONFIG_TYPE_2 | PCI_NO_IRQ_STEERING);
+    pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
+    pci_register_slot(0x01, PCI_CARD_SPECIAL, 0, 0, 0, 0);
+    pci_register_slot(0x06, PCI_CARD_NORMAL, 3, 2, 1, 4);
+    pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4);
+    pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4);
+    pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430lx_device);
+    device_add(&keyboard_ps2_intel_ami_pci_device);
+    device_add(&sio_device);
+    device_add(&fdc37c665_device);
+    device_add(&intel_flash_bxt_ami_device);
 
     return ret;
 }
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index aa8bc373e..c45de5a5f 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -636,7 +636,7 @@ ifeq ($(USE_VECT486VL), y)
 OPTS		+= -DUSE_VECT486VL
 endif
 
-ifeq ($(DELLS4), y)
+ifeq ($(USE_DELLS4), y)
 OPTS		+= -DUSE_DELLS4
 endif