diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 31a3ec2..c862e12 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   6.%{gitdate}%{?dist}
+Release:   7.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -65,6 +65,7 @@ Patch5004: xserver-1.5.0-wfs.patch
 Patch5005: xserver-1.5.0-unselinux.patch
 Patch5006: xserver-1.5.0-ia64.patch
 Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
+Patch5008: xserver-1.5.0-xaa-sucks.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -513,6 +514,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 13 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-7.20080310
+- xserver-1.5.0-xaa-sucks: Disable XAA offscreen pixmaps by default.  They're
+  almost always a performance loss anyway.  Use Option "XaaOffscreenPixmaps"
+  to turn them back on.
+
 * Thu Mar 13 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-6.20080310
 - fix fbdev probing with no hardware to not load fbdev if pci slot claimed
 
diff --git a/xserver-1.5.0-xaa-sucks.patch b/xserver-1.5.0-xaa-sucks.patch
new file mode 100644
index 0000000..f429375
--- /dev/null
+++ b/xserver-1.5.0-xaa-sucks.patch
@@ -0,0 +1,46 @@
+From a01ca030c7a1f38e411281d888f0acf2c3fb40f3 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 13 Mar 2008 13:38:02 -0400
+Subject: [PATCH] Disable XAA offscreen pixmaps by default.
+
+Say Option "XaaOffscreenPixmaps" to turn them back on.
+---
+ hw/xfree86/xaa/xaaInitAccel.c |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
+index 1b7c154..f3c8f56 100644
+--- a/hw/xfree86/xaa/xaaInitAccel.c
++++ b/hw/xfree86/xaa/xaaInitAccel.c
+@@ -43,7 +43,8 @@ typedef enum {
+     XAAOPT_WRITE_BITMAP,
+     XAAOPT_WRITE_PIXMAP,
+     XAAOPT_PIXMAP_CACHE,
+-    XAAOPT_OFFSCREEN_PIXMAPS
++    XAAOPT_OFFSCREEN_PIXMAPS,
++    XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE
+ } XAAOpts;
+ 
+ static const OptionInfoRec XAAOptions[] = {
+@@ -89,6 +90,8 @@ static const OptionInfoRec XAAOptions[] = {
+ 				OPTV_BOOLEAN,	{0}, FALSE },
+     {XAAOPT_OFFSCREEN_PIXMAPS,		"XaaNoOffscreenPixmaps",
+ 				OPTV_BOOLEAN,	{0}, FALSE },
++    {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps",
++				OPTV_BOOLEAN,   {0}, FALSE },
+     { -1,				NULL,
+ 				OPTV_NONE,	{0}, FALSE }
+ };
+@@ -518,7 +521,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+ #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
+ 
+     if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
+-		!xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
++		xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
++    {
+ 	XAAMSG("\tOffscreen Pixmaps\n");
+     } else {
+ 	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+-- 
+1.5.4.3
+