diff --git a/ChangeLog b/ChangeLog
index 3e25f4329c..53383e400f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-19  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 572387 – gdm crashes after gtk 2.15.4 upgrade
+
+	* gdk/x11/gdkscreen-x11.c (init_xrandr13): If X is broken and returns
+	no monitors, fall back to other multihead init methods, so that we
+	at least get one monitor set up.
+
 2009-02-19  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkmountoperation.c: sort functions so their order is more
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 1902a350a0..3b9a8455f1 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -735,7 +735,7 @@ init_randr13 (GdkScreen *screen)
   screen_x11->n_monitors = monitors->len;
   screen_x11->monitors = (GdkX11Monitor *)g_array_free (monitors, FALSE);
 
-  return TRUE;
+  return screen_x11->n_monitors > 0;
 #endif
   
   return FALSE;