diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 72c90155f..6f89f9425 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1470,9 +1470,9 @@ bool RunCommandViaPopen(const char* command,
   std::string commandInDir;
   if(dir)
     {
-    commandInDir = "cd ";
+    commandInDir = "cd \"";
     commandInDir += dir;
-    commandInDir += " && ";
+    commandInDir += "\" && ";
     commandInDir += command;
     }
   else