diff --git a/NEWS b/NEWS
index eff9674ef..d8d34bed2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+gnome-control-center 2.11.6
+
+-  expose the cursor theme settings as xsettings (Matthias Clasen)
+
+------------------------------------------------------------------------------
 gnome-control-center 2.11.5
 
 - new "about-me" capplet by Diego Gonzalez <diego@pemas.net>
diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 5dd6c1313..9b777c10f 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-07  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-settings-xsettings.c: 
+	patch by Matthias Clasen <mclasen@redhat.com> to expose the cursor 
+	theme settings as xsettings (Closes: #308104).
+
 2005-06-12  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-settings-daemon.c: (clipboard_manager_watch_cb):
diff --git a/gnome-settings-daemon/gnome-settings-xsettings.c b/gnome-settings-daemon/gnome-settings-xsettings.c
index bb58990fd..1ac5b6b0a 100644
--- a/gnome-settings-daemon/gnome-settings-xsettings.c
+++ b/gnome-settings-daemon/gnome-settings-xsettings.c
@@ -134,6 +134,10 @@ static TranslationEntry translations [] = {
       GCONF_VALUE_BOOL,		translate_bool_int },
   { "/desktop/gnome/interface/menubar_accel",  "Gtk/MenuBarAccel",
       GCONF_VALUE_STRING,      translate_string_string },
+  { "/desktop/gnome/peripherals/mouse/cursor_theme",	"Gtk/CursorThemeName",
+      GCONF_VALUE_STRING,	translate_string_string },
+  { "/desktop/gnome/peripherals/mouse/cursor_size",	"Gtk/CursorThemeSize",
+      GCONF_VALUE_INT,		translate_int_int },
 };
 
 static TranslationEntry*