diff --git a/ChangeLog b/ChangeLog
index 981cdaab2..eda9ecf24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-11  Jens Granseuer  <jensgr@gmx.net>
+
+	* configure.in: require gnome-desktop 2.23.90
+
 2008-08-04  Rodrigo Moya <rodrigo@gnome-db.org>
 
 	* NEWS:
diff --git a/capplets/display/ChangeLog b/capplets/display/ChangeLog
index 11fef8565..df3f4ecd1 100644
--- a/capplets/display/ChangeLog
+++ b/capplets/display/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-11  Jens Granseuer  <jensgr@gmx.net>
+
+	* xrandr-capplet.c: (run_application): fail gracefully if we cannot
+	get a screen
+
 2008-08-08  Jens Granseuer  <jensgr@gmx.net>
 
 	* xrandr-capplet.c: (on_screen_changed), (rebuild_gui),
diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
index 255912695..23d3c5d20 100644
--- a/capplets/display/xrandr-capplet.c
+++ b/capplets/display/xrandr-capplet.c
@@ -1690,9 +1690,16 @@ run_application (App *app)
 	return;
     }
 
+    app->screen = gnome_rr_screen_new (gdk_screen_get_default (),
+				       on_screen_changed, app);
+    if (!app->screen)
+    {
+	g_error ("Could not get screen info");
+	g_object_unref (xml);
+	return;
+    }
+
     app->client = gconf_client_get_default ();
-    app->screen = gnome_rr_screen_new (gdk_screen_get_default(),
-				 on_screen_changed, app);
 
     app->dialog = glade_xml_get_widget (xml, "dialog");
 
@@ -1785,6 +1792,8 @@ restart:
     }
 
     gtk_widget_destroy (app->dialog);
+    gnome_rr_screen_destroy (app->screen);
+    g_object_unref (app->client);
 }
 
 int
diff --git a/configure.in b/configure.in
index 41bfdbbda..3f8782a08 100644
--- a/configure.in
+++ b/configure.in
@@ -96,7 +96,7 @@ COMMON_MODULES="gtk+-2.0 >= 2.11.6 dnl
  gconf-2.0 dnl
  libgnomeui-2.0 >= 2.2.0 dnl
  libglade-2.0 >= 2.0.0 dnl
- gnome-desktop-2.0 >= 2.23.5"
+ gnome-desktop-2.0 >= 2.23.90"
 PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0)
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)