diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index cef28bd7d3ff8a67878c6bd767f09afa6c23ab8d..0db98af7ded20c952378b7171886b487c89cf1e4 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-27  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* server.c (run_shell): Quote directory name passed to cd.
+
 2009-03-01  Bruce Korb  <bkorb@gnu.org>
 	Apply a positively ancient patch:
 
diff --git a/fixincludes/server.c b/fixincludes/server.c
index 6db8cf7e101a98e59494e2a3e795789e79c1dc27..1e50efc9faaf5686ec7bf29e6893f846fd471cec 100644
--- a/fixincludes/server.c
+++ b/fixincludes/server.c
@@ -266,7 +266,7 @@ run_shell (const char* pz_cmd)
   /*  Make sure the process will pay attention to us, send the
      supplied command, and then have it output a special marker that
      we can find.  */
-  fprintf (server_pair.pf_write, "cd %s\n%s\n\necho\necho %s\n",
+  fprintf (server_pair.pf_write, "cd \"%s\"\n%s\n\necho\necho %s\n",
            p_cur_dir, pz_cmd, z_done);
   fflush (server_pair.pf_write);