diff --git a/XAANoOffscreenPixmaps.diff b/XAANoOffscreenPixmaps.diff
new file mode 100644
index 0000000..9e5d076
--- /dev/null
+++ b/XAANoOffscreenPixmaps.diff
@@ -0,0 +1,11 @@
+--- hw/xfree86/xaa/xaaInitAccel.c.orig	2007-11-06 15:45:37.000000000 +0100
++++ hw/xfree86/xaa/xaaInitAccel.c	2008-04-10 06:38:52.000000000 +0200
+@@ -542,7 +542,7 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoR
+ #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
+ 
+     if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
+-		!xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
++		!xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS, TRUE)) {
+ 	XAAMSG("\tOffscreen Pixmaps\n");
+     } else {
+ 	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index e9bb012..88e9752 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 06:55:28 CEST 2008 - sndirsch@suse.de
+
+- XAANoOffscreenPixmaps.diff
+  * disable Offscreen Pixmaps by default (bnc #376068)
+
 -------------------------------------------------------------------
 Wed Apr  9 20:12:22 CEST 2008 - schwab@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index b70c9f9..c077315 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -22,7 +22,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        88
+Release:        89
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -112,6 +112,7 @@ Patch103:       confine_to_shape.diff
 Patch104:       bitmap_always_unscaled.diff
 Patch105:       commit-37b1258.diff
 Patch106:       randr1_1-sig11.diff
+Patch107:       XAANoOffscreenPixmaps.diff
 
 %description
 This package contains the X.Org Server.
@@ -253,6 +254,7 @@ popd
 %patch104 -p1
 %patch105 -p1
 %patch106 -p1
+%patch107 -p0
 
 %build
 pushd xorg-docs-*
@@ -559,6 +561,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Apr 10 2008 sndirsch@suse.de
+- XAANoOffscreenPixmaps.diff
+  * disable Offscreen Pixmaps by default (bnc #376068)
 * Wed Apr 09 2008 schwab@suse.de
 - Fix another o-b-1 in pci domain support.
 * Wed Apr 09 2008 sndirsch@suse.de