diff --git a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
index d0a7f719e5..dff5fd8067 100644
--- a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
+++ b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
@@ -116,15 +116,33 @@ const struct supported_device {
 	{0x0d04, 0x0d26, INTEL_MODEL_HASM, "Haswell Mobile"},
 	{0x0a04, 0x0a16, INTEL_MODEL_HASM, "Haswell Mobile"},
 
+#if 0
 	// XXX: 0x0f00 only confirmed on 0x0f30, 0x0f31
-	{0x0f00, 0x0155, INTEL_MODEL_VLV, "ValleyView Desktop"},
 	{0x0f00, 0x0f30, INTEL_MODEL_VLVM, "ValleyView Mobile"},
 	{0x0f00, 0x0f31, INTEL_MODEL_VLVM, "ValleyView Mobile"},
 	{0x0f00, 0x0f32, INTEL_MODEL_VLVM, "ValleyView Mobile"},
 	{0x0f00, 0x0f33, INTEL_MODEL_VLVM, "ValleyView Mobile"},
-	{0x0f00, 0x0157, INTEL_MODEL_VLVM, "ValleyView Mobile"},
+#endif
 
-	{0x1604, 0x1616, INTEL_MODEL_BDWM, "HD Graphics 5500 (Broadwell GT2)"},
+	// XXX: 0x1604 only confirmed on 0x1616
+	{0x1604, 0x1606, INTEL_MODEL_BDWM, "Broadwell GT1 ULT"},
+	{0x1604, 0x160b, INTEL_MODEL_BDWM, "Broadwell GT1 Iris"},
+	{0x1604, 0x160e, INTEL_MODEL_BDWM, "Broadwell GT1 ULX"},
+	{0x1604, 0x1602, INTEL_MODEL_BDWM, "Broadwell GT1 ULT"},
+	{0x1604, 0x160a, INTEL_MODEL_BDWS, "Broadwell GT1 Server"},
+	{0x1604, 0x160d, INTEL_MODEL_BDW,  "Broadwell GT1 Workstation"},
+	{0x1604, 0x1616, INTEL_MODEL_BDWM, "Broadwell GT2 ULT"},
+	{0x1604, 0x161b, INTEL_MODEL_BDWM, "Broadwell GT2 ULT"},
+	{0x1604, 0x161e, INTEL_MODEL_BDWM, "Broadwell GT2 ULX"},
+	{0x1604, 0x1612, INTEL_MODEL_BDWM, "Broadwell GT2 Halo"},
+	{0x1604, 0x161a, INTEL_MODEL_BDWS, "Broadwell GT2 Server"},
+	{0x1604, 0x161d, INTEL_MODEL_BDW,  "Broadwell GT2 Workstation"},
+	{0x1604, 0x1626, INTEL_MODEL_BDWM, "Broadwell GT3 ULT"},
+	{0x1604, 0x162b, INTEL_MODEL_BDWM, "Broadwell GT3 Iris"},
+	{0x1604, 0x162e, INTEL_MODEL_BDWM, "Broadwell GT3 ULX"},
+	{0x1604, 0x1622, INTEL_MODEL_BDWM, "Broadwell GT3 ULT"},
+	{0x1604, 0x162a, INTEL_MODEL_BDWS, "Broadwell GT3 Server"},
+	{0x1604, 0x162d, INTEL_MODEL_BDW,  "Broadwell GT3 Workstation"},
 
 	// XXX: 0x1904 only confirmed on 0x1916
 	{0x1904, 0x1902, INTEL_MODEL_SKY,  "Skylake GT1"},
diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
index 103dd2068e..191be9b768 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
@@ -106,18 +106,31 @@ const struct supported_device {
 	{0x0a16, INTEL_MODEL_HASM, "Haswell Mobile"},
 
 #if 0
-	// The driver does not make any attempt to handle this modern hardware.
-	// Better let VESA/UEFI do it.
-	{0x0155, INTEL_MODEL_VLV, "ValleyView Desktop"},
 	{0x0f30, INTEL_MODEL_VLVM, "ValleyView Mobile"},
 	{0x0f31, INTEL_MODEL_VLVM, "ValleyView Mobile"},
 	{0x0f32, INTEL_MODEL_VLVM, "ValleyView Mobile"},
 	{0x0f33, INTEL_MODEL_VLVM, "ValleyView Mobile"},
-	{0x0157, INTEL_MODEL_VLVM, "ValleyView Mobile"},
-
-//	{0x1616, INTEL_MODEL_BDWM, "HD Graphics 5500 (Broadwell GT2)"},
 #endif
 
+	{0x1606, INTEL_MODEL_BDWM, "Broadwell GT1 ULT"},
+	{0x160b, INTEL_MODEL_BDWM, "Broadwell GT1 Iris"},
+	{0x160e, INTEL_MODEL_BDWM, "Broadwell GT1 ULX"},
+	{0x1602, INTEL_MODEL_BDWM, "Broadwell GT1 ULT"},
+	{0x160a, INTEL_MODEL_BDWS, "Broadwell GT1 Server"},
+	{0x160d, INTEL_MODEL_BDW,  "Broadwell GT1 Workstation"},
+	{0x1616, INTEL_MODEL_BDWM, "Broadwell GT2 ULT"},
+	{0x161b, INTEL_MODEL_BDWM, "Broadwell GT2 ULT"},
+	{0x161e, INTEL_MODEL_BDWM, "Broadwell GT2 ULX"},
+	{0x1612, INTEL_MODEL_BDWM, "Broadwell GT2 Halo"},
+	{0x161a, INTEL_MODEL_BDWS, "Broadwell GT2 Server"},
+	{0x161d, INTEL_MODEL_BDW,  "Broadwell GT2 Workstation"},
+	{0x1626, INTEL_MODEL_BDWM, "Broadwell GT3 ULT"},
+	{0x162b, INTEL_MODEL_BDWM, "Broadwell GT3 Iris"},
+	{0x162e, INTEL_MODEL_BDWM, "Broadwell GT3 ULX"},
+	{0x1622, INTEL_MODEL_BDWM, "Broadwell GT3 ULT"},
+	{0x162a, INTEL_MODEL_BDWS, "Broadwell GT3 Server"},
+	{0x162d, INTEL_MODEL_BDW,  "Broadwell GT3 Workstation"},
+
 	{0x1902, INTEL_MODEL_SKY,  "Skylake GT1"},
 	{0x1906, INTEL_MODEL_SKYM, "Skylake GT1"},
 	{0x190a, INTEL_MODEL_SKYS, "Skylake GT1"},