diff --git a/.cvsignore b/.cvsignore
index 593a86e..9df529e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-compiz-99c96865db7b46b881fcd44f709008043ecfcb66.tar.bz2
+compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
diff --git a/compiz.spec b/compiz.spec
index 0357e0c..d6957c2 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -1,11 +1,14 @@
-%define		sha1 99c96865db7b46b881fcd44f709008043ecfcb66
+#						-*- mode: rpm-spec -*-
+
+%define		sha1 fc6b7773fc52f6104b66a9f86c18395f8a958848
+%define		snapshot 20060721
 
 Name:           compiz
 Url:            http://www.freedesktop.org/Software/compiz
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.6.20060717git%{?dist}
+Release:        0.8.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,6 +35,7 @@ Patch102: tfp-server-extension.patch
 Patch103: composite-cube-logo.patch
 Patch104: fbconfig-depth-fix.patch
 Patch105: fedora-logo.patch
+Patch106: glfinish.patch
 
 
 %description
@@ -51,11 +55,12 @@ for binding redirected top-level windows to texture objects.
 %patch103 -p1 -b .composite-cube-logo
 %patch104 -p1 -b .fbconfig-depth-fix
 %patch105 -p1 -b .fedora-logo
+%patch106 -p1 -b .glfinish
 
 %build
 %configure --disable-libsvg-cairo
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -92,6 +97,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/locale/*/LC_MESSAGES/compiz.mo
 
 %changelog
+* Fri Jul 21 2006 Kristian Høgsberg <krh@redhat.com> - 0.0.13-0.8.20060720git
+- Add workaround for AIGLX throttling problem.
+
+* Thu Jul 20 2006 Kristian Høgsberg <krh@redhat.com> - 0.0.13-0.7.20060720git
+- Drop scale plugin from snapshot.
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen@redhat.com> - 0.0.13-0.6.20060717git
 - Don't build on s390
 
@@ -103,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri Jul  7 2006 Kristian Høgsberg <krh@redhat.com> - 0.0.13.fedora1-4
 - Drop the fullscreen hardcode patch and require X server that has
-GLX_MESA_copy_sub_buffer.
+  GLX_MESA_copy_sub_buffer.
 
 * Tue Jun 27 2006 Kristian Høgsberg <krh@redhat.com> - 0.0.13.fedora1-3
 - Unbreak --replace.
@@ -113,4 +124,4 @@ GLX_MESA_copy_sub_buffer.
 
 * Wed Jun 14 2006 Kristian Høgsberg <krh@redhat.com> - 0.0.13.fedora1-1
 - Spec file for compiz, borrowing bits and pieces from Alphonse Van
-Assches spec file (#192432).
+  Assches spec file (#192432).
diff --git a/composite-cube-logo.patch b/composite-cube-logo.patch
index 3da3880..f73e53d 100644
--- a/composite-cube-logo.patch
+++ b/composite-cube-logo.patch
@@ -9,7 +9,7 @@ From: Kristian Høgsberg <krh@redhat.com>
  1 files changed, 17 insertions(+), 0 deletions(-)
 
 diff --git a/plugins/cube.c b/plugins/cube.c
-index b605e22..6439b9e 100644
+index b222685..0576b8d 100644
 --- a/plugins/cube.c
 +++ b/plugins/cube.c
 @@ -1204,11 +1204,28 @@ cubePaintTransformedScreen (CompScreen		
diff --git a/fedora-logo.patch b/fedora-logo.patch
index 7cf4150..9ad6f7c 100644
--- a/fedora-logo.patch
+++ b/fedora-logo.patch
@@ -10,7 +10,7 @@ From: Kristian Høgsberg <krh@redhat.com>
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/plugins/compiz.schemas.in.in b/plugins/compiz.schemas.in.in
-index 949cfe6..59c3e81 100644
+index 899622d..dddbfcd 100644
 --- a/plugins/compiz.schemas.in.in
 +++ b/plugins/compiz.schemas.in.in
 @@ -913,7 +913,7 @@
@@ -32,7 +32,7 @@ index 949cfe6..59c3e81 100644
                  <short>Image files</short>
                  <long>
 diff --git a/plugins/cube.c b/plugins/cube.c
-index 6439b9e..6563cca 100644
+index 0576b8d..e9e8299 100644
 --- a/plugins/cube.c
 +++ b/plugins/cube.c
 @@ -44,14 +44,14 @@ #include <X11/Xproto.h>
diff --git a/sources b/sources
index 2142a55..e752d8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f652f76edac9e0cc7d6c0fe329de802  compiz-99c96865db7b46b881fcd44f709008043ecfcb66.tar.bz2
+16382b2db6ffc65161a6edc70559ee67  compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
diff --git a/tfp-server-extension.patch b/tfp-server-extension.patch
index 5dc3151..be9d4f1 100644
--- a/tfp-server-extension.patch
+++ b/tfp-server-extension.patch
@@ -9,7 +9,7 @@ too.
  1 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/screen.c b/src/screen.c
-index f45663c..0a13d9b 100644
+index b9be10b..14e7083 100644
 --- a/src/screen.c
 +++ b/src/screen.c
 @@ -897,7 +897,7 @@ addScreen (CompDisplay *display,