diff -u compiz-fusion-plugins-main-0.8.2/debian/changelog compiz-fusion-plugins-main-0.8.2/debian/changelog
--- compiz-fusion-plugins-main-0.8.2/debian/changelog
+++ compiz-fusion-plugins-main-0.8.2/debian/changelog
@@ -1,3 +1,13 @@
+compiz-fusion-plugins-main (0.8.2-0ubuntu2) jaunty; urgency=low
+
+  * debian/patches/07_workarounds_force_glx_sync.patch:
+    - workarounds.git commit 46960f12a9d213e5f0e841557e2ed2f7ea18cc79:
+      Add workaround to force X-to-GLX synchronization, which should help
+      for the race condition in the XDamage protocol Nvidia users are
+      suffering from.  (LP: #269904)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sun, 15 Mar 2009 15:12:21 -0400
+
 compiz-fusion-plugins-main (0.8.2-0ubuntu1) jaunty; urgency=low
 
   * new upstream release
only in patch2:
unchanged:
--- compiz-fusion-plugins-main-0.8.2.orig/debian/patches/07_workarounds_force_glx_sync.patch
+++ compiz-fusion-plugins-main-0.8.2/debian/patches/07_workarounds_force_glx_sync.patch
@@ -0,0 +1,26 @@
+--- a/src/workarounds/workarounds.c
++++ b/src/workarounds/workarounds.c
+@@ -198,6 +198,9 @@ workaroundsPaintScreen (CompScreen   *s,
+ 
+     currentScreen = s;
+ 
++    if (workaroundsGetForceGlxSync (s->display))
++	glXWaitX ();
++
+     UNWRAP (ws, s, paintScreen);
+     (*s->paintScreen) (s, outputs, numOutputs, mask);
+     WRAP (ws, s, paintScreen, workaroundsPaintScreen);
+--- a/metadata/workarounds.xml.in
++++ b/metadata/workarounds.xml.in
+@@ -53,6 +53,11 @@
+                 <_long>Fix for broken GLX_MESA_copy_sub_buffer on XGL in fglrx.</_long>
+                 <default>false</default>
+             </option>
++            <option type="bool" name="force_glx_sync">
++                <_short>Force synchronization between X and GLX</_short>
++                <_long>Force synchronization between X and GLX, which may help for window parts not redrawing correctly when using Nvidia drivers, but also may decrease performance.</_long>
++                <default>false</default>
++            </option>
+             <subgroup>
+                 <_short>Window stickyness</_short>
+                 <option type="bool" name="sticky_alldesktops">