diff --git a/compare-keys-carefully.patch b/compare-keys-carefully.patch
new file mode 100644
index 0000000..c23dd95
--- /dev/null
+++ b/compare-keys-carefully.patch
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon-2.26.1/plugins/keybindings/gsd-keybindings-manager.c	2009-04-11 12:25:32.000000000 -0400
++++ hacked/plugins/keybindings/gsd-keybindings-manager.c	2009-04-29 14:18:12.706975126 -0400
+@@ -268,6 +274,8 @@
+                                         return FALSE;
+                         }
+                 }
++		else if (key->keycodes != NULL || other->keycodes != NULL)
++			return FALSE;
+ 
+                 return TRUE;
+         }
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 6f2dee4..9b9b5e5 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -41,6 +41,9 @@ Patch11:	gnome-settings-daemon-2.26.0-support-touchpads.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=580616
+Patch13:	compare-keys-carefully.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -62,6 +65,7 @@ developing applications that use %{name}.
 %patch10 -p1 -b .catch-deviceadded
 %patch11 -p1 -b .support-touchpads
 %patch12 -p1 -b .lefthand-touchpad
+%patch13 -p1 -b .compare-keys-carefully
 
 autoreconf -i -f
 
@@ -174,6 +178,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen  <mclasen@redhat.com> - 2.26.1-3
+- Make custom keybindings work better (#497725)
+
 * Wed Apr 29 2009 Bastien Nocera <bnocera@redhat.com> 2.26.1-2
 - Don't set touchpads to be left-handed, otherwise the tap
   behaves like the 2nd mouse button (#483639)