diff --git a/packages/x11/driver/xf86-video-intel/patches/122_dont_fixup_mtrrs_in_gem_config.diff b/packages/x11/driver/xf86-video-intel/patches/122_dont_fixup_mtrrs_in_gem_config.diff
new file mode 100644
index 0000000000..7b77dfea57
--- /dev/null
+++ b/packages/x11/driver/xf86-video-intel/patches/122_dont_fixup_mtrrs_in_gem_config.diff
@@ -0,0 +1,14 @@
+diff -Naur xf86-video-intel-2.8.0.901/src/i830_driver.c.org xf86-video-intel-2.8.0.901/src/i830_driver.c
+--- xf86-video-intel-2.8.0.901/src/i830_driver.c.org	2009-08-13 22:07:07.000000000 +0200
++++ xf86-video-intel-2.8.0.901/src/i830_driver.c	2009-09-12 13:34:06.000000000 +0200
+@@ -2685,7 +2695,9 @@
+        return FALSE;
+    }
+ 
+-   i830_fixup_mtrrs(pScrn);
++   /* In a GEM config, the kernel manages MTRRs */
++   if (!pI830->memory_manager)
++       i830_fixup_mtrrs(pScrn);
+ 
+    pI830->starting = TRUE;
+ 
diff --git a/packages/x11/driver/xf86-video-intel/patches/80_quirks.diff b/packages/x11/driver/xf86-video-intel/patches/80_quirks.diff
index 4256779fac..f097553116 100644
--- a/packages/x11/driver/xf86-video-intel/patches/80_quirks.diff
+++ b/packages/x11/driver/xf86-video-intel/patches/80_quirks.diff
@@ -40,7 +40,7 @@
 -    /* Dell Latitude D400 needs pipe A force quirk (LP: #228519) */
 +    /* Dell Latitude C400 needs pipe A force quirk (See LP: #216490) */
 +    { PCI_CHIP_I855_GM, 0x1028, 0x00c8, quirk_pipea_force },
-+    /* Dell Latitude D400 needs pipe A force quirk (See LP: #228519) *
++    /* Dell Latitude D400 needs pipe A force quirk (See LP: #228519) */
      { PCI_CHIP_I855_GM, 0x1028, 0x0139, quirk_pipea_force },
      /* Dell Latitude D500 needs pipe A force quirk */
      { PCI_CHIP_I855_GM, 0x1028, 0x0152, quirk_pipea_force },