diff --git a/Mesa.changes b/Mesa.changes
index 2dd0ec7..1d8a8a8 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat May 22 16:00:55 CEST 2010 - sndirsch@suse.de
+
+- Mesa_indirect_old_xserver_compatibility.diff (revival)
+  Workaround for enabling indirect rendering to older Xservers
+  (bnc #469280, bnc #600672).
+
 -------------------------------------------------------------------
 Sat Apr 10 22:03:00 CEST 2010 - sndirsch@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index 7422e0d..04161ef 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -35,7 +35,7 @@ Obsoletes:      Mesa-64bit
 #
 %define _version 7.8.1
 Version:        7.8.1
-Release:        2
+Release:        3
 Summary:        Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
 Source:         MesaLib-%{_version}.tar.bz2
 Source1:        MesaDemos-%{_version}.tar.bz2
@@ -47,7 +47,7 @@ Source5:        drirc
 Patch1:         dri_driver_dir.diff
 # to be upstreamed
 Patch8:         egl-buildfix.diff
-# from Mesa 7.8 branch
+Patch9:         Mesa_indirect_old_xserver_compatibility.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -116,6 +116,7 @@ rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
 sed -i 's/REPLACE/%_lib/g' src/glx/Makefile
 sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
 %patch8
+%patch9 -p0
 
 %build
 
diff --git a/Mesa_indirect_old_xserver_compatibility.diff b/Mesa_indirect_old_xserver_compatibility.diff
new file mode 100644
index 0000000..fe8913c
--- /dev/null
+++ b/Mesa_indirect_old_xserver_compatibility.diff
@@ -0,0 +1,14 @@
+--- src/glx/glxext.c.orig	2010-05-22 15:57:21.000000000 +0200
++++ src/glx/glxext.c	2010-05-22 15:57:37.000000000 +0200
+@@ -820,9 +820,11 @@ __glXInitialize(Display * dpy)
+       dpyPriv->dri2Display = dri2CreateDisplay(dpy);
+       dpyPriv->driDisplay = driCreateDisplay(dpy);
+    }
++#if 0
+    if (glx_direct)
+       dpyPriv->driswDisplay = driswCreateDisplay(dpy);
+ #endif
++#endif
+ 
+    if (!AllocAndFetchScreenConfigs(dpy, dpyPriv)) {
+       __glXUnlock();