diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index d6ccc31..c66463a 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:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -95,6 +95,9 @@ Patch6015: xserver-1.5.99.902-vnc.patch
 # RH 469572, FDO 20081
 Patch6016: xserver-1.5.99.902-xkb-colors.patch
 
+# Make autoconfiguration chose nouveau driver for NVIDIA GPUs
+Patch6017: xserver-1.5.99.902-nouveau.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -511,6 +514,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 16 2009 Ben Skeggs <bskeggs@redhat.com> 1.5.99.902-12
+- xserver-1.5.99.902-nouveau.patch: select nouveau as default driver
+  for NVIDIA GPUs
+
 * Mon Feb 16 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-11
 - xserver-1.5.99.902-xkb-colors.patch: don't confuse src and dst when copying
   color labels (#469572)
diff --git a/xserver-1.5.99.902-nouveau.patch b/xserver-1.5.99.902-nouveau.patch
new file mode 100644
index 0000000..0ff4db5
--- /dev/null
+++ b/xserver-1.5.99.902-nouveau.patch
@@ -0,0 +1,37 @@
+From cc8ff24ba47acbe13872176086b6d75943508e61 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x@fedoraproject.org>
+Date: Mon, 16 Feb 2009 15:50:14 +1000
+Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs
+
+---
+ hw/xfree86/common/xf86AutoConfig.c |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 19c06c8..853d661 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
+@@ -181,7 +181,19 @@ videoPtrToDriverList(struct pci_device *dev,
+ 	case 0x102b:		    driverList[0] = "mga";	break;
+ 	case 0x10c8:		    driverList[0] = "neomagic"; break;
+ 	case 0x105d:		    driverList[0] = "i128";	break;
+-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
++	case 0x10de:
++	    switch (dev->device_id & 0xfff0) {
++	    /* Non-functional with both nouveau and nv */
++	    case 0x0840:
++	    case 0x0860:
++		driverList[0] = "vesa";
++		break;
++	    default:
++		driverList[0] = "nouveau";
++		break;
++	    }
++	    break;
++	case 0x12d2:		    driverList[0] = "nv";	break;
+ 	case 0x1163:		    driverList[0] = "rendition"; break;
+ 	case 0x5333:
+ 	    switch (dev->device_id)
+-- 
+1.6.1.3
+