diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 8e5bdcf..7fc5079 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.902
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -85,6 +85,9 @@ Patch6011: xserver-1.5.99.902-mediakeys-crash.patch
 # ensure HAL can start after X, upstream soon, not 1.6 yet.
 Patch6012: xserver-1.5.99.902-listen-for-hal.patch
 
+# don't try intel on poulsbo
+Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -501,6 +504,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 10 2009 Adam Jackson <ajax@redhat.com> 1.5.99.902-7
+- xserver-1.5.99.902-sod-off-poulsbo.patch: Don't try the intel driver on
+  GMA500. (#472674)
+
 * Tue Feb 10 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-6
 - xserver-1.5.99.902-listen-for-hal.patch: listen for HAL startup
   notifications if it isn't running already.
diff --git a/xserver-1.5.99.902-sod-off-poulsbo.patch b/xserver-1.5.99.902-sod-off-poulsbo.patch
new file mode 100644
index 0000000..ac3bce1
--- /dev/null
+++ b/xserver-1.5.99.902-sod-off-poulsbo.patch
@@ -0,0 +1,26 @@
+From c799dd4390e5ea301c8f4f81784ac590b97f7a07 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 10 Feb 2009 10:25:19 -0500
+Subject: [PATCH] autoconfig: ignore poulsbo
+
+Thanks, Intel.
+---
+ hw/xfree86/common/xf86AutoConfig.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index a9a1fd2..19c06c8 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
+@@ -171,6 +171,8 @@ videoPtrToDriverList(struct pci_device *dev,
+ 	case 0x8086:
+ 	    if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
+ 		driverList[0] = "i740";
++	    } else if (dev->device_id == 0x8108) {
++		break; /* you got powervr in my intel! */
+ 	    } else {
+ 		driverList[0] = "intel";
+ 		driverList[1] = "i810";
+-- 
+1.6.1.2
+