diff --git a/.cvsignore b/.cvsignore
index 2be2600..68494a0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-settings-daemon-2.23.6.tar.bz2
+gnome-settings-daemon-2.23.90.tar.bz2
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 1a8d6c0..8a2dd62 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.23.6
-Release:	3%{?dist}
+Version:	2.23.90
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -31,9 +31,6 @@ BuildRequires:	perl(XML::Parser)
 BuildRequires:  intltool
 
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
-# survive xrandr being absent (such as on Xnest in sabayon)
-# http://bugzilla.gnome.org/show_bug.cgi?id=546446
-Patch5:		xrandr-missingok.patch
 Patch6:		gnome-settings-daemon-2.23.4-drop-sample-cache.patch
 
 %description
@@ -55,7 +52,6 @@ developing applications that use %{name}.
 %setup -q
 
 %patch2 -p1 -b .ignore-layout-if-using-evdev
-%patch5 -p1 -b .xrandr-missingok
 %patch6 -p1 -b .drop-sample-cache
 
 %build
@@ -156,6 +152,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Fri Aug 22 2008 Matthias Clasen <mclasne@redhat.com> - 2.23.90-1
+- Update to 2.23.90
+
 * Thu Aug 14 2008 Lennart Poettering <lpoetter@redhat.com> - 2.23.6-3
 - Rerun autotools after patching configure.ac
 
diff --git a/sources b/sources
index 0c71f5b..5043f3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0064d0572803c4682733034eadc03d20  gnome-settings-daemon-2.23.6.tar.bz2
+fa13f79d1e9adea1e8f3e85107cd045e  gnome-settings-daemon-2.23.90.tar.bz2
diff --git a/xrandr-missingok.patch b/xrandr-missingok.patch
deleted file mode 100644
index b38422e..0000000
--- a/xrandr-missingok.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c
---- gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok	2008-08-04 10:25:53.000000000 -0400
-+++ gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c	2008-08-05 13:25:25.000000000 -0400
-@@ -296,6 +296,12 @@ gsd_xrandr_manager_start (GsdXrandrManag
- {
-         g_debug ("Starting xrandr manager");
- 
-+        if (manager->priv->rw_screen == NULL) {
-+                g_set_error (error, 0, 0, "Failed to initialize XRandr extension");
-+                return FALSE;
-+        }
-+ 
-+
-         manager->priv->running = TRUE;
-         manager->priv->client = gconf_client_get_default ();
-