diff --git a/depth-override-fix.patch b/depth-override-fix.patch
new file mode 100644
index 0000000..377743a
--- /dev/null
+++ b/depth-override-fix.patch
@@ -0,0 +1,25 @@
+From df6ae3f0a39f95cb1199ac16c98be2bf9a3bc96f Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Wed, 1 Oct 2008 14:14:06 -0700
+Subject: [PATCH] i965: Fix overwriting of depth override for SetTexOffset.
+
+Fixes black borders around windows in compiz.  Bug #17233.
+---
+ src/mesa/drivers/dri/i965/brw_wm_surface_state.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+index 47127c0..3790b50 100644
+--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
++++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+@@ -274,7 +274,6 @@ brw_update_texture_surface( GLcontext *ctx, GLuint unit )
+    key.width = firstImage->Width;
+    key.height = firstImage->Height;
+    key.cpp = intelObj->mt->cpp;
+-   key.depth = firstImage->Depth;
+    key.tiling = intelObj->mt->region->tiling;
+ 
+    dri_bo_unreference(brw->wm.surf_bo[unit + MAX_DRAW_BUFFERS]);
+-- 
+1.6.0.1
+
diff --git a/mesa.spec b/mesa.spec
index f74cb27..08e173c 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -18,7 +18,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.2
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -35,6 +35,7 @@ Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2
 Patch0: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
+Patch4: depth-override-fix.patch
 
 Patch5: r300-bufmgr.patch
 
@@ -171,6 +172,7 @@ This package provides some demo applications for testing Mesa.
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p0 -b .no-mach64
+%patch4 -p1 -b .depth-override-fix
 %patch5 -p1 -b .r300-bufmgr
 %patch7 -p1 -b .dricore
 %patch9 -p1 -b .intel-vbl
@@ -420,6 +422,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Oct  9 2008 Kristian Høgsberg <krh@redhat.com> - 7.2-0.6
+- Fix black shadows in compiz (fix from Eric Anholt, bugs.fd.o #17233)
+
 * Wed Oct 01 2008 Dave Airlie <airlied@redhat.com> 7.2-0.5
 - fix drm requires