diff --git a/ChangeLog b/ChangeLog
index 5ed0408696..6432d63500 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-27  Richard Hult  <richard@imendio.com>
+
+	Merged from trunk:
+
+	Bug 557894 – Wrong return value for
+	gdk_pointer_grab_info_libgtk_only()
+
+	* gdk/quartz/gdkevents-quartz.c:
+	(gdk_pointer_grab_info_libgtk_only): Return TRUE when there is a
+	pointer grab. Patch by Owen Taylor.
+
 2008-10-23  Alexander Larsson  <alexl@redhat.com>
 
 	Merged from trunk:
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 44920061b9..fc223a3d14 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -245,7 +245,7 @@ gdk_pointer_grab_info_libgtk_only (GdkDisplay *display,
   if (owner_events)
     *owner_events = pointer_grab_owner_events;
 
-  return FALSE;
+  return TRUE;
 }
 
 void