diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 55c0d75..31f4dcc 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -223,9 +223,21 @@
 	.ops_pci		= &gma_pci_ops,
 };
 
-static const unsigned short pci_device_ids[] = { 0x0102, 0x0106, 0x010a, 0x0112,
-						 0x0116, 0x0122, 0x0126, 0x0166,
-						 0 };
+static const unsigned short pci_device_ids[] = {
+	0x0402, /* Desktop GT1 */
+	0x0412, /* Desktop GT2 */
+	0x0422, /* Desktop GT3 */
+	0x0406, /* Mobile GT1 */
+	0x0416, /* Mobile GT2 */
+	0x0426, /* Mobile GT3 */
+	0x0d16, /* Mobile 4+3 GT1 */
+	0x0d26, /* Mobile 4+3 GT2 */
+	0x0d36, /* Mobile 4+3 GT3 */
+	0x0a06, /* ULT GT1 */
+	0x0a16, /* ULT GT2 */
+	0x0a26, /* ULT GT3 */
+	0,
+};
 
 static const struct pci_driver pch_lpc __pci_driver = {
 	.ops	 = &gma_func0_ops,
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 52b24ba..5731077 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -175,15 +175,15 @@
 	/* Top of Upper Usable DRAM, including remap */
 	touud = pci_read_config32(dev, TOUUD+4);
 	touud <<= 32;
-	touud |= pci_read_config32(dev, TOUUD);
+	touud |= pci_read_config32(dev, TOUUD) & ~1;
 
 	/* Top of Lower Usable DRAM */
-	tolud = pci_read_config32(dev, TOLUD);
+	tolud = pci_read_config32(dev, TOLUD) & ~1;
 
 	/* Top of Memory - does not account for any UMA */
 	tom = pci_read_config32(dev, 0xa4);
 	tom <<= 32;
-	tom |= pci_read_config32(dev, 0xa0);
+	tom |= pci_read_config32(dev, 0xa0) & ~1;
 
 	printk(BIOS_DEBUG, "TOUUD 0x%llx TOLUD 0x%08x TOM 0x%llx\n",
 	       touud, tolud, tom);
@@ -467,6 +467,12 @@
 	.device = 0x0c04, /* Mobile Haswell */
 };
 
+static const struct pci_driver mc_driver_hsw_ult __pci_driver = {
+	.ops    = &mc_ops,
+	.vendor = PCI_VENDOR_ID_INTEL,
+	.device = 0x0a04, /* ULT Haswell */
+};
+
 static void cpu_bus_init(device_t dev)
 {
 	initialize_cpus(dev->link_list);