diff -p -up gnome-control-center-2.21.4/shell/control-center.c.menulocation gnome-control-center-2.21.4/shell/control-center.c
--- gnome-control-center-2.21.4/shell/control-center.c.menulocation	2007-05-31 23:53:38.000000000 +0200
+++ gnome-control-center-2.21.4/shell/control-center.c	2008-01-07 15:11:19.000000000 +0100
@@ -114,6 +114,7 @@ handle_static_action_clicked (Tile * til
 int
 main (int argc, char *argv[])
 {
+        const char *xdg_config_dirs;
 	BonoboApplication *bonobo_app = NULL;
 	gboolean hidden = FALSE;
 	gchar * startup_id;
@@ -127,6 +128,20 @@ main (int argc, char *argv[])
 	textdomain (GETTEXT_PACKAGE);
 #endif
 
+ 	xdg_config_dirs = g_getenv ("XDG_CONFIG_DIRS");
+ 	if (xdg_config_dirs && *xdg_config_dirs != '\0') {
+ 		if (!strstr (xdg_config_dirs, "/etc/xdg/gnome")) {
+ 			char * new_xdg_config_dirs;
+ 			
+ 			new_xdg_config_dirs = g_strconcat (xdg_config_dirs, ":/etc/xdg/gnome:/etc/xdg", NULL);
+ 			g_setenv ("XDG_CONFIG_DIRS", new_xdg_config_dirs, TRUE);
+ 			g_free (new_xdg_config_dirs);
+ 		}
+ 	}
+ 	else {
+ 		g_setenv ("XDG_CONFIG_DIRS", "/etc/xdg/gnome:/etc/xdg", TRUE);
+ 	}
+
 	if (argc > 1)
 	{
 		if (argc != 2 || strcmp ("-h", argv[1]))