diff --git a/src/arch/i386/include/arch/acpi.h b/src/arch/i386/include/arch/acpi.h
index 5c0e73f181..a69d8ca00f 100644
--- a/src/arch/i386/include/arch/acpi.h
+++ b/src/arch/i386/include/arch/acpi.h
@@ -31,14 +31,14 @@ typedef unsigned long long u64;
 #define SLIT_NAME	      "SLIT"
 
 #define RSDT_TABLE            "RSDT    "
-#define HPET_TABLE            "HPET    "
+#define HPET_TABLE            "AMD64   "
 #define MCFG_TABLE            "MCFG    "
 #define MADT_TABLE            "MADT    "
 #define SRAT_TABLE	      "SRAT    "
 #define SLIT_TABLE	      "SLIT    "
 
-#define OEM_ID                "COREv2"
-#define ASLC                  "CORE"
+#define OEM_ID                "LXBIOS"
+#define ASLC                  "NONE"
 
 /* ACPI 2.0 table RSDP */
 
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 942bd64b54..ff1edc81a2 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2335,15 +2335,17 @@
 #define PCI_DEVICE_ID_INTEL_6300ESB_WDT		0x25ab
 
 /* Intel 3100 */
-#define PCI_DEVICE_ID_INTEL_3100_ISA    0x2670
+#define PCI_DEVICE_ID_INTEL_3100_LPC    0x2670
 #define PCI_DEVICE_ID_INTEL_3100_EHCI   0x268c
 #define PCI_DEVICE_ID_INTEL_3100_PCI    0x244e
-#define PCI_DEVICE_ID_INTEL_3100_USB    0x2688
-#define PCI_DEVICE_ID_INTEL_3100_SMB    0x269b
-#define PCI_DEVICE_ID_INTEL_3100_USB2   0x2689
-#define PCI_DEVICE_ID_INTEL_3100_USB3   0x268c
 #define PCI_DEVICE_ID_INTEL_3100_SATA   0x2680
 #define PCI_DEVICE_ID_INTEL_3100_SATA_R 0x2681
+#define PCI_DEVICE_ID_INTEL_3100_USB    0x2688
+#define PCI_DEVICE_ID_INTEL_3100_USB2   0x2689
+#define PCI_DEVICE_ID_INTEL_3100_SMB    0x269b
+#define PCI_DEVICE_ID_INTEL_3100_MC     0x35b0
+#define PCI_DEVICE_ID_INTEL_3100_PCIE_PA 0x35b6
+#define PCI_DEVICE_ID_INTEL_3100_PCIE_PA1 0x35b7
 
 #define PCI_DEVICE_ID_INTEL_80310	0x530d
 #define PCI_DEVICE_ID_INTEL_82810_MC1	0x7120
@@ -2371,8 +2373,6 @@
 #define PCI_DEVICE_ID_INTEL_PCIE_PA1	0x3596
 #define PCI_DEVICE_ID_INTEL_PCIE_PB	0x3597
 #define PCI_DEVICE_ID_INTEL_PCIE_PC	0x3599
-#define PCI_DEVICE_ID_INTEL_PCIE_QA	0x35b6
-#define PCI_DEVICE_ID_INTEL_PCIE_QA1	0x35b7
 
 #define PCI_VENDOR_ID_COMPUTONE		0x8e0e
 #define PCI_DEVICE_ID_COMPUTONE_IP2EX	0x0291