diff --git a/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch b/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch
index b2667860631..be57812a8c8 100644
--- a/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch
+++ b/srcpkgs/xorg-server/patches/autoconfig-nvidia.patch
@@ -1,10 +1,10 @@
 --- hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
 +++ hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1111,7 +1111,23 @@
-	{
-	    int idx = 0;
+@@ -1144,7 +1144,23 @@
+         int idx = 0;
+
  #ifdef __linux__
--	    driverList[idx++] = "nouveau";
+-        driverList[idx++] = "nouveau";
 +	    switch (dev->device_id)
 +		{
 +		/* NV1 */
@@ -23,5 +23,5 @@
 +		    break;
 +		}
  #endif
-	    driverList[idx++] = "nv";
- 	    break;
+         driverList[idx++] = "nv";
+         break;
diff --git a/srcpkgs/xorg-server/patches/autoconfig-sis.patch b/srcpkgs/xorg-server/patches/autoconfig-sis.patch
index 9a75453cf05..0b50049db55 100644
--- a/srcpkgs/xorg-server/patches/autoconfig-sis.patch
+++ b/srcpkgs/xorg-server/patches/autoconfig-sis.patch
@@ -1,10 +1,12 @@
 --- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
 +++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
-@@ -1140,7 +1140,15 @@
-		    driverList[0] = "savage"; break;
-	    }
-	    break;
--	case 0x1039:		    driverList[0] = "sis";	break;
+@@ -1200,9 +1200,15 @@
+             break;
+         }
+         break;
+-    case 0x1039:
+-        driverList[0] = "sis";
+-        break;
 +	case 0x1039:
 +	    switch (dev->device_id)
 +	    {
@@ -14,6 +16,6 @@
 +		    driverList[0] = "sis"; break;
 +	    }
 +	    break;
-	case 0x126f:		    driverList[0] = "siliconmotion"; break;
-	case 0x121a:
-	    if (dev->device_id < 0x0003)
+     case 0x126f:
+         driverList[0] = "siliconmotion";
+         break;
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 9804dcae73b..60fabc64652 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
-version=1.12.0
+version=1.12.0.902
 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@@ -15,7 +15,7 @@ short_desc="X11 server from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org"
 license="MIT/X11, BSD"
-checksum=280a14c5de8697a4aab18dca85429671286e69e5ada0c1535f03666e56f07799
+checksum=dbd81e096ec5d23b55b8fb67e08aefc2717e5c95209be1132432fd4461b41116
 long_desc="
  The X11 server from the modularized source tree of X.org."