diff --git a/ChangeLog b/ChangeLog
index 9b8a532c9d..6d207cf92f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-04  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/gdkkeys-quartz.c: (maybe_update_keymap): Make shift
+	tab work with unicode layouts (e.g. all Leopard layouts), fixes
+	bug #493404.
+
 2007-11-03  Richard Hult  <richard@imendio.com>
 
 	* gtk/gtkclipboard-quartz.c: (clipboard_owner_destroyed),
diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c
index dd8b63e292..7a2448b50d 100644
--- a/gdk/quartz/gdkkeys-quartz.c
+++ b/gdk/quartz/gdkkeys-quartz.c
@@ -322,6 +322,12 @@ maybe_update_keymap (void)
 			      break;
 			    }
 			}
+
+		      /* Special-case shift-tab since GTK+ expects
+		       * GDK_ISO_Left_Tab for that.
+		       */
+		      if (found && p[j] == GDK_Tab && modifiers[j] == shiftKey)
+			p[j] = GDK_ISO_Left_Tab;
 		      
 		      if (!found)
 			p[j] = gdk_unicode_to_keyval (uc);