diff --git a/ChangeLog b/ChangeLog
index 20f2fd511..99c02e0eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-14  Jens Granseuer  <jensgr@gmx.net>
+
+	* configure.in:
+	* capplets/common/gnome-theme-info.c (gnome_theme_init): query and
+	monitor the xcursor icon dir for cursor themes, too (bug #469882)
+
 2007-10-09  Bastien Nocera  <hadess@hadess.net>
 
 	* schemas/apps_gnome_settings_daemon_keybindings.schemas.in:
diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c
index f7dce8b35..3f8211b86 100644
--- a/capplets/common/gnome-theme-info.c
+++ b/capplets/common/gnome-theme-info.c
@@ -1991,6 +1991,17 @@ gnome_theme_init (gboolean *monitor_not_added)
       top_theme_dir_string = g_build_filename (INSTALL_PREFIX, "share", "icons", NULL);
     }
   top_theme_dir_uri = gnome_vfs_uri_new (top_theme_dir_string);
+
+#ifdef XCURSOR_ICONDIR
+  /* if there's a separate xcursors dir, add that as well */
+  if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) &&
+      strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) {
+    top_theme_dir_uri = gnome_vfs_uri_new (XCURSOR_ICONDIR);
+    if (gnome_vfs_uri_exists (top_theme_dir_uri))
+      result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 1, NULL);
+    gnome_vfs_uri_unref (top_theme_dir_uri);
+  }
+#endif
   g_free (top_theme_dir_string);
 
   if (!gnome_vfs_uri_exists (top_theme_dir_uri))
diff --git a/configure.in b/configure.in
index 92e52ef0e..21d51bb2d 100644
--- a/configure.in
+++ b/configure.in
@@ -177,6 +177,17 @@ AM_CONDITIONAL(HAVE_XCURSOR, [test $have_xcursor=yes])
 AC_SUBST(XCURSOR_CFLAGS)
 AC_SUBST(XCURSOR_LIBS)
 
+if test x$have_xcursor = xyes; then
+  AC_MSG_CHECKING([for XCURSOR cursor location])
+  XCURSOR_ICONDIR=$($PKG_CONFIG --variable=icondir xcursor)
+  if test "x$XCURSOR_ICONDIR" != x; then
+    AC_DEFINE_UNQUOTED(XCURSOR_ICONDIR, "${XCURSOR_ICONDIR}", [Define to the xcursor icon path])
+  else
+    XCURSOR_ICONDIR=none
+  fi
+  AC_MSG_RESULT([${XCURSOR_ICONDIR}])
+fi
+
 CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS"
 
 dnl ==============