diff --git a/compiz.spec b/compiz.spec
index 62d0376..e6d0a50 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,7 @@ Patch1:   compiz-always-restack-windows-on-map.patch
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch106: redhat-logo.patch
+Patch110: scale-key.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -117,6 +118,7 @@ and other kde integration related stuff
 %else
 %patch106 -p1 -b .redhat-logo
 %endif
+%patch110 -p1 -b .scale-key
 
 
 %build
@@ -276,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 12 2007 Kristian Høgsberg <krh@redhat.com> - 0.6.0-2
+- Disable scale corner initiate and install a GNOME key config entry.
+
 * Wed Oct 10 2007 Warren Togami <wtogami@redhat.com> - 0.6.0-1
 - 0.6.0 final
 - always-restack-windows-on-map 
diff --git a/scale-key.patch b/scale-key.patch
new file mode 100644
index 0000000..902d86c
--- /dev/null
+++ b/scale-key.patch
@@ -0,0 +1,21 @@
+diff -up compiz-6b86f3/metadata/scale.xml.in.scale-key compiz-6b86f3/metadata/scale.xml.in
+--- compiz-6b86f3/metadata/scale.xml.in.scale-key	2007-08-22 18:57:43.000000000 -0400
++++ compiz-6b86f3/metadata/scale.xml.in	2007-10-12 10:59:02.000000000 -0400
+@@ -12,7 +12,6 @@
+ 		<allowed key="true" button="true" edge="true" edgednd="true"/>
+ 		<default>
+ 		    <key>&lt;Shift&gt;&lt;Alt&gt;Up</key>
+-		    <edges top_right="true"/>
+ 		</default>
+ 	    </option>
+ 	    <option name="initiate_all" type="action">
+diff -up compiz-6b86f3/gtk/gnome/50-compiz-desktop-key.xml.in.scale-key compiz-6b86f3/gtk/gnome/50-compiz-desktop-key.xml.in
+--- compiz-6b86f3/gtk/gnome/50-compiz-desktop-key.xml.in.scale-key	2007-10-12 11:18:03.000000000 -0400
++++ compiz-6b86f3/gtk/gnome/50-compiz-desktop-key.xml.in	2007-10-12 11:16:56.000000000 -0400
+@@ -13,4 +13,6 @@
+ 
+         <KeyListEntry name="/apps/compiz/general/allscreens/options/run_command_terminal_key"/>
+ 
++        <KeyListEntry name="/apps/compiz/plugins/scale/allscreens/options/initiate_key"/>
++
+ </KeyListEntries>