diff --git a/srcpkgs/xorg-server/patches/autoconfig-ati.patch b/srcpkgs/xorg-server/patches/autoconfig-ati.patch
new file mode 100644
index 00000000000..8ac8a31f257
--- /dev/null
+++ b/srcpkgs/xorg-server/patches/autoconfig-ati.patch
@@ -0,0 +1,19 @@
+Prefer the AMD Catalyst "fglrx" driver if found.
+
+--- hw/xfree86/common/xf86pciBus.c.orig	2013-02-07 19:59:55.690518107 +0100
++++ hw/xfree86/common/xf86pciBus.c	2013-02-07 20:01:14.832594170 +0100
+@@ -1132,8 +1132,13 @@ xf86VideoPtrToDriverList(struct pci_devi
+         driverList[0] = "ast";
+         break;
+     case 0x1002:
+-        driverList[0] = "ati";
++	{
++		int idx = 0;
++
++		driverList[idx++] = "fglrx"
++        	driverList[idx++] = "ati";
+         break;
++	}
+     case 0x102c:
+         driverList[0] = "chips";
+         break;
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 21ea4635797..1e53779ce8a 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.13.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb