diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 10e88860f9..93509e86a4 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -1811,24 +1811,34 @@
 #define PCI_DEVICE_ID_INTEL_82865	0x1227
 #define PCI_DEVICE_ID_INTEL_82557	0x1229
 #define PCI_DEVICE_ID_INTEL_82437	0x122d
-#define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e
-#define PCI_DEVICE_ID_INTEL_82371FB_1	0x1230
-#define PCI_DEVICE_ID_INTEL_82371MX	0x1234
-#define PCI_DEVICE_ID_INTEL_82437MX	0x1235
 #define PCI_DEVICE_ID_INTEL_82441	0x1237
 #define PCI_DEVICE_ID_INTEL_82380FB	0x124b
 #define PCI_DEVICE_ID_INTEL_82439	0x1250
 #define PCI_DEVICE_ID_INTEL_80960_RP	0x1960
-#define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
-#define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
-#define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020
 #define PCI_DEVICE_ID_INTEL_82437VX	0x7030
 #define PCI_DEVICE_ID_INTEL_82439TX	0x7100
+
+/* Intel 82371FB (PIIX) */
+#define PCI_DEVICE_ID_INTEL_82371FB_ISA		0x122e
+#define PCI_DEVICE_ID_INTEL_82371FB_IDE		0x1230
+
+/* Intel 82371SB (PIIX3) */
+#define PCI_DEVICE_ID_INTEL_82371SB_ISA		0x7000
+#define PCI_DEVICE_ID_INTEL_82371SB_IDE		0x7010
+#define PCI_DEVICE_ID_INTEL_82371SB_USB		0x7020
+
+/* Intel 82371MX (MPIIX) */
+#define PCI_DEVICE_ID_INTEL_82371MX_ISA_IDE	0x1234
+
+/* Intel 82437MX (part of the 430MX chipset) */
+#define PCI_DEVICE_ID_INTEL_82437MX_ISA_IDE	0x1235
+
+/* Intel 82371AB/EB/MB (PIIX4/PIIX4E/PIIX4M) */
+/* The 440MX (82443MX) consists of 82443BX + 82371EB (uses same PCI IDs). */
 #define PCI_DEVICE_ID_INTEL_82371AB_ISA		0x7110
 #define PCI_DEVICE_ID_INTEL_82371AB_IDE		0x7111
 #define PCI_DEVICE_ID_INTEL_82371AB_USB		0x7112
-#define PCI_DEVICE_ID_INTEL_82371AB_ACPI	0x7113 /* Same as SMB */
-#define PCI_DEVICE_ID_INTEL_82371AB_SMB		0x7113 /* Same as ACPI */
+#define PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI	0x7113
 
 /* Intel 82801AA (ICH) */
 #define PCI_DEVICE_ID_INTEL_82801AA_LPC		0x2410
diff --git a/src/southbridge/intel/i82371eb/i82371eb_early_smbus.c b/src/southbridge/intel/i82371eb/i82371eb_early_smbus.c
index 7ef268d654..30b6e6a320 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_early_smbus.c
+++ b/src/southbridge/intel/i82371eb/i82371eb_early_smbus.c
@@ -33,7 +33,7 @@ static void enable_smbus(void)
 	uint16_t reg16;
 
 	dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL,
-				PCI_DEVICE_ID_INTEL_82371AB_SMB), 0);
+				PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI), 0);
 
 	if (dev == PCI_DEV_INVALID) {
 		die("SMBus controller not found\r\n");
diff --git a/src/southbridge/intel/i82371eb/i82371eb_smbus.c b/src/southbridge/intel/i82371eb/i82371eb_smbus.c
index 05eb029d55..838380d7bb 100644
--- a/src/southbridge/intel/i82371eb/i82371eb_smbus.c
+++ b/src/southbridge/intel/i82371eb/i82371eb_smbus.c
@@ -41,5 +41,5 @@ static struct device_operations smbus_ops = {
 static const struct pci_driver smbus_driver __pci_driver = {
 	.ops	= &smbus_ops,
 	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371AB_SMB,
+	.device	= PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI,
 };