diff --git a/ChangeLog b/ChangeLog
index 91d4cf9ea7..1d17b93c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-05  Michael Natterer  <mitch@imendio.com>
+
+	Merged from HEAD:
+
+	* gtk/gtkwindow.c (gtk_window_key_release_event): chain up to
+	the right function (fix taken from maemo-gtk).
+
 2007-01-05  Behdad Esfahbod  <behdad@gnome.org>
 
 	* gdk/gdkprivate.h:
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index ac548fa885..e98b89af85 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4720,7 +4720,7 @@ gtk_window_key_release_event (GtkWidget   *widget,
 
   /* Chain up, invokes binding set */
   if (!handled)
-    handled = GTK_WIDGET_CLASS (gtk_window_parent_class)->key_press_event (widget, event);
+    handled = GTK_WIDGET_CLASS (gtk_window_parent_class)->key_release_event (widget, event);
 
   return handled;
 }