diff --git a/Mesa.changes b/Mesa.changes
index 2776b70..20f6da6 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 17 20:34:36 UTC 2011 - vljn@ovi.com
+
+- Update to Mesa 7.11.1 
+  * U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff included
+
 -------------------------------------------------------------------
 Wed Oct 06 21:58:00 UTC 2011 - idonmez@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index f4dedad..3f8a325 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -17,9 +17,9 @@
 
 # norootforbuild
 
-%define _version 7.11
+%define _version 7.11.1
 
-Version:        7.11
+Version:        7.11.1
 Release:        5
 
 Name:           Mesa
@@ -52,7 +52,6 @@ Patch9:         u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # already upstream
 Patch13:        U_Mesa-7.11-llvm3.patch
-Patch14:        U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff
 Patch15:        Mesa-llvm-3.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -123,7 +122,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch9 -p1
 %patch11 -p1
 %patch13 -p0
-%patch14 -p1
 %patch15 -p1
 
 %build
diff --git a/MesaLib-7.11.1.tar.bz2 b/MesaLib-7.11.1.tar.bz2
new file mode 100644
index 0000000..685046b
--- /dev/null
+++ b/MesaLib-7.11.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dbc1c12434caa25f52e398053a97515aa67a81b9e7fe621572835fb61b08fc4
+size 6662652
diff --git a/MesaLib-7.11.tar.bz2 b/MesaLib-7.11.tar.bz2
deleted file mode 100644
index f71fdc3..0000000
--- a/MesaLib-7.11.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d8dd5f16536a400e44f860f52e49e79e2476b648e06f13d8ca72449c7c0bccf
-size 6664313
diff --git a/U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff b/U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff
deleted file mode 100644
index 41c14a0..0000000
--- a/U_glx-ignore-BadRequest-errors-from-DRI2Connect.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From fbc2fcf685d22ec9bc9465e1f731529979497eaa Mon Sep 17 00:00:00 2001
-From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
-Date: Thu, 04 Aug 2011 02:06:13 +0000
-Subject: glx/dri2: Paper over errors in DRI2Connect when indirect
-
-DRI2 will throw BadRequest for this when the client is not local, but
-DRI2 is an implementation detail and not something callers should have
-to know about.  Silently swallow errors in this case, and just propagate
-the failure through DRI2Connect's return code.
-
-Note: This is a candidate for the stable release branches.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28125
-Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
----
-diff --git a/src/glx/dri2.c b/src/glx/dri2.c
-index 229840d..b1b5013 100644
---- a/src/glx/dri2.c
-+++ b/src/glx/dri2.c
-@@ -190,6 +190,15 @@ DRI2Error(Display *display, xError *err, XExtCodes *codes, int *ret_code)
- 	err->minorCode == X_DRI2DestroyDrawable)
- 	return True;
- 
-+    /* If the server is non-local DRI2Connect will raise BadRequest.
-+     * Swallow this so that DRI2Connect can signal this in its return code */
-+    if (err->majorCode == codes->major_opcode &&
-+        err->minorCode == X_DRI2Connect &&
-+        err->errorCode == BadRequest) {
-+	*ret_code = False;
-+	return True;
-+    }
-+
-     return False;
- }
- 
---
-cgit v0.8.3-6-g21f6