diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 1d998ca..c810483 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -599,6 +599,10 @@
 	/* Set the subsystem vendor and device ID for mainboard devices. */
 	ops = ops_pci(dev);
 	if (dev->on_mainboard && ops && ops->set_subsystem) {
+		if (CONFIG_SUBSYSTEM_VENDOR_ID)
+			dev->subsystem_vendor = CONFIG_SUBSYSTEM_VENDOR_ID;
+		if (CONFIG_SUBSYSTEM_DEVICE_ID)
+			dev->subsystem_device = CONFIG_SUBSYSTEM_DEVICE_ID;
 		printk(BIOS_DEBUG, "%s subsystem <- %04x/%04x\n",
 			dev_path(dev), dev->subsystem_vendor,
 			dev->subsystem_device);