diff --git a/.cvsignore b/.cvsignore
index 7d38ed5..b19f9d6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-compiz-0.3.6.tar.bz2
-desktop-effects-0.7.1.tar.bz2
+compiz-0.4.0.tar.gz
diff --git a/compiz.spec b/compiz.spec
index a078175..e034568 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -5,8 +5,8 @@ Name:           compiz
 Url:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
-Version:        0.3.6
-Release:        10%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,7 @@ BuildRequires:  dbus-devel
 BuildRequires:  librsvg2-devel
 BuildRequires:  metacity-devel >= 2.18
 
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.gz
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 
 # Patches that are not upstream
@@ -46,8 +46,6 @@ Patch101: aiglx-defaults.patch
 Patch102: tfp-server-extension.patch
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
-Patch114: restart.patch
-Patch116: terminate-move.patch
 Patch117: close-session.patch
 Patch118: compiz-0.3.6-wnck-modal-window.patch
 
@@ -81,8 +79,6 @@ windows and compositing manager.
 %patch102 -p1 -b .tfp-server-extension
 %patch103 -p1 -b .composite-cube-logo
 %patch105 -p1 -b .fedora-logo
-%patch114 -p1 -b .restart
-%patch116 -p1 -b .terminate-move
 %patch117 -p1 -b .close-session
 %patch118 -p1 -b .wnck-modal-window
 
@@ -200,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdecoration.so
 
 %changelog
+* Tue Jun  5 2007 Matthias Clasen <mclasen@redhat.com> - 0.4.0-1
+- Update to 0.4.0
+
 * Mon Jun  4 2007 Matthias Clasen <mclasen@redhat.com> - 0.3.6-10
 - Rebuild against new libwnck
 
diff --git a/sources b/sources
index aac580c..fa82b09 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-260b03fc9ae62ff1ad4e8c5e92d56180  compiz-0.3.6.tar.bz2
+b09499d45b59f92b8a188625733590f4  compiz-0.4.0.tar.gz
 e11f289f7dfe8a6a6b321f21ee938d2b  desktop-effects-0.7.1.tar.bz2
diff --git a/tfp-server-extension.patch b/tfp-server-extension.patch
index 8e1d6e6..6ca4ab3 100644
--- a/tfp-server-extension.patch
+++ b/tfp-server-extension.patch
@@ -1,15 +1,15 @@
---- compiz-0.3.6/src/screen.c~	2006-12-29 14:24:40.000000000 -0500
-+++ compiz-0.3.6/src/screen.c	2007-01-12 16:01:34.000000000 -0500
-@@ -1384,7 +1384,7 @@
+--- compiz-0.4.0/src/screen.c.tfp-server-extension	2007-04-02 05:05:49.000000000 -0400
++++ compiz-0.4.0/src/screen.c	2007-06-05 23:20:52.000000000 -0400
+@@ -1396,7 +1396,7 @@ addScreen (CompDisplay *display,
      Window		 *children;
      unsigned int	 nchildren;
      int			 defaultDepth, nvisinfo, nElements, value, i;
 -    const char		 *glxExtensions, *glExtensions;
 +    const char		 *glxExtensions, *glxServerExtensions, *glExtensions;
-     GLint	         stencilBits;
      XSetWindowAttributes attrib;
      GLfloat		 globalAmbient[]  = { 0.1f, 0.1f,  0.1f, 0.1f };
-@@ -1630,7 +1630,10 @@
+     GLfloat		 ambientLight[]   = { 0.0f, 0.0f,  0.0f, 0.0f };
+@@ -1645,7 +1645,10 @@ addScreen (CompDisplay *display,
  	    i++;
  
  	glxExtensions = glXQueryExtensionsString (dpy, screenNum);