--- plugins/keybindings/gsd-keybindings-manager.c.orig	2010-08-03 18:09:56.464036978 +0200
+++ plugins/keybindings/gsd-keybindings-manager.c	2010-08-03 18:27:43.337030184 +0200
@@ -430,7 +430,7 @@
                 display_index = i++;
         }
 
-        retval = g_new (char *, i + 1);
+        retval = g_new (char *, i + 2);
 
         for (i = 0; environ [i]; i++) {
                 if (i == display_index) {
@@ -440,6 +440,8 @@
                 }
         }
 
+	retval [i] = g_strdup("CALLED_FROM=gsd-keybindings-manager");
+	i++;
         retval [i] = NULL;
 
         return retval;
--- gnome-settings-daemon/main.c.orig	2010-08-03 18:35:57.757038916 +0200
+++ gnome-settings-daemon/main.c	2010-08-03 18:37:26.084005898 +0200
@@ -374,6 +374,7 @@
 
         /* get outta the way */
         chdir ("/");
+	g_setenv ("PWD", "/", TRUE);
 }
 
 static void
