diff --git a/ChangeLog b/ChangeLog
index d5b1a20d46..75b6a00c29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-08  Richard Hult  <richard@imendio.com>
+
+	* gdk/quartz/gdkeventloop-quartz.c (poll_func): Only set the fake
+	fd's revents, not the first one. Fixes bug #531056, spotted by
+	Yevgen Muntyan.
+
 2008-05-07  Tor Lillqvist  <tml@novell.com>
 
 	* gtk-zip.sh.in: Add gtk-update-icon-cache.exe and more man pages
diff --git a/gdk/quartz/gdkeventloop-quartz.c b/gdk/quartz/gdkeventloop-quartz.c
index dcc8c9ca91..9c8b443878 100644
--- a/gdk/quartz/gdkeventloop-quartz.c
+++ b/gdk/quartz/gdkeventloop-quartz.c
@@ -295,7 +295,14 @@ poll_func (GPollFD *ufds, guint nfds, gint timeout_)
 
   if (event) 
     {
-      ufds[0].revents = G_IO_IN;
+      for (i = 0; i < nfds; i++)
+        {
+          if (ufds[i].fd == -1)
+            {
+              ufds[i].revents = G_IO_IN;
+              break;
+            }
+        }
 
       current_event = [event retain];