diff --git a/src/tools/common.jam b/src/tools/common.jam
index 8df9d53d6..35c887cfc 100644
--- a/src/tools/common.jam
+++ b/src/tools/common.jam
@@ -501,10 +501,12 @@ if "\n" = "n"
     # see below.
     nl = "
 " ;
+    q = "" ;
 }
 else
 {
     nl = "\n" ; 
+    q = "\"" ;
 }
 
 # Returns the command needed to set an environment variable on the current
@@ -526,7 +528,7 @@ rule variable-setting-command ( variable : value )
         # sequence that messes up the executed export command which then reports
         # that the passed variable name is incorrect.
         # But we have a check for cygwin in kernel/bootstrap.jam already.
-        return "$(variable)=$(value)$(nl)export $(variable)$(nl)" ;
+        return "$(variable)=$(q)$(value)$(nl)export $(variable)$(q)$(nl)" ;
     }
 }