diff --git a/Mesa.changes b/Mesa.changes
index 1d8a8a8..2dd0ec7 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-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 9327ae2..7422e0d 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -47,7 +47,7 @@ Source5:        drirc
 Patch1:         dri_driver_dir.diff
 # to be upstreamed
 Patch8:         egl-buildfix.diff
-Patch9:         Mesa_indirect_old_xserver_compatibility.diff
+# from Mesa 7.8 branch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -116,7 +116,6 @@ 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
deleted file mode 100644
index fe8913c..0000000
--- a/Mesa_indirect_old_xserver_compatibility.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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();