diff --git a/.cvsignore b/.cvsignore
index ae725a9..f8ce7f8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 gl-manpages-1.0.1.tar.bz2
-mesa-20080303.tar.bz2
+mesa-20080311.tar.bz2
diff --git a/mesa.spec b/mesa.spec
index c911431..d00ce49 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -10,12 +10,12 @@
 %endif
 
 %define manpages gl-manpages-1.0.1
-%define gitdate 20080303
+%define gitdate 20080311
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.19%{?dist}
+Release: 0.20%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -30,6 +30,9 @@ Source3: make-git-snapshot.sh
 Patch0: mesa-7.1pre-osmesa-version.patch
 Patch2: mesa-7.1pre-nukeglthread-debug.patch
 
+# This doesn't work, disable for now.
+Patch3: disable-tex-offset.patch
+
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.0-0.5
@@ -151,6 +154,7 @@ This package provides some demo applications for testing Mesa.
 %setup -q -n mesa-%{gitdate} -b2
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
+%patch3 -p1 -b .disable-tex-offset
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -393,6 +397,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Mar 11 2008 Kristian Høgsberg <krh@redhat.com> - 7.1-0.20
+- Looks like the TexOffset extension does not work, disable for now.
+- Bump to 20080311 snapshot to get DRI2 tfp fixes.
+
 * Mon Mar  3 2008 Kristian Høgsberg <krh@redhat.com> - 7.1-0.19
 - Bump to latest git snapshot.
 - Drop mesa-7.1-dri-drivers.patch, it's upstream.
diff --git a/sources b/sources
index 1fc276d..752279d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-2b1a09d87cd56f4601265993ac747db3  mesa-20080303.tar.bz2
+35148aa4ae18e67e69d0fea04ab07e83  mesa-20080311.tar.bz2