diff --git a/compiz-always-restack-windows-on-map.patch b/compiz-always-restack-windows-on-map.patch
new file mode 100644
index 0000000..aa5e393
--- /dev/null
+++ b/compiz-always-restack-windows-on-map.patch
@@ -0,0 +1,26 @@
+http://lists.freedesktop.org/archives/compiz/2007-October/002697.html
+
+From: Danny Baumann <dannybaumann@web.de>
+Date: Tue, 2 Oct 2007 05:16:00 +0000 (+0200)
+Subject: We always need to restack windows on map. Newly created windows are placed on top ...
+X-Git-Tag: start
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/app/compiz.git;a=commitdiff;h=b6c6acc70261d0942977441914c23e7a1c99215e
+
+We always need to restack windows on map. Newly created windows are placed on top of the stack first, which is not desired for some windows that may be denied focus (such as desktop windows).
+This commit reverts commit 67648904b15c7781000a212a122b558a2d2afcf6.
+---
+
+--- a/src/event.c
++++ b/src/event.c
+@@ -1922,10 +1922,7 @@ handleEvent (CompDisplay *d,
+ 
+ 		allowFocus = allowWindowFocus (w);
+ 
+-		if (allowFocus)
+-		    updateWindowAttributes (w, CompStackingUpdateModeNormal);
+-		else
+-		    updateWindowAttributes (w, CompStackingUpdateModeNone);
++		updateWindowAttributes (w, CompStackingUpdateModeNormal);
+ 
+ 		if (!allowFocus &&
+ 		    (w->type & ~(CompWindowTypeSplashMask |
diff --git a/compiz.spec b/compiz.spec
index 5b370b7..62d0376 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -1,4 +1,3 @@
-%define		snapshot	6b86f3
 %define		dialogversion	0.7.7
 
 %define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom
@@ -13,8 +12,8 @@ Name:           compiz
 URL:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
-Version:        0.5.2
-Release:        14.%{snapshot}%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,10 +43,11 @@ BuildRequires:  mesa-libGLU-devel
 BuildRequires:  kdebase-devel, kdelibs-devel
 BuildRequires:	dbus-qt-devel
 
-Source0:        %{name}-%{snapshot}.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 
 Patch0:   compiz-synthetic-configure-notify-events.patch
+Patch1:   compiz-always-restack-windows-on-map.patch
 # Patches that are not upstream
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
@@ -107,9 +107,10 @@ and other kde integration related stuff
 
 %prep
 %setup -q -T -b1 -n desktop-effects-%{dialogversion}
-%setup -q  -n compiz-%{snapshot}
+%setup -q 
 
 %patch0 -p1 -b .synthetic-configure-notify-events
+%patch1 -p1 -b .always-restack-windows-on-map
 %patch103 -p1 -b .composite-cube-logo
 %if 0%{?fedora}
 %patch105 -p1 -b .fedora-logo
@@ -275,6 +276,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 10 2007 Warren Togami <wtogami@redhat.com> - 0.6.0-1
+- 0.6.0 final
+- always-restack-windows-on-map 
+
 * Tue Oct  9 2007 Warren Togami <wtogami@redhat.com> - 0.5.2-14
 - Make compiz behave with gnome-terminal (#304051)