diff --git a/msvc-tools.jam b/msvc-tools.jam
index 65bb51c1a..767c0a834 100644
--- a/msvc-tools.jam
+++ b/msvc-tools.jam
@@ -30,6 +30,13 @@ if ! $(MSVCDir)
 }
 else
 {
+    # This hack reconstitutes paths containing spaces as long as
+    # they don't contain any consecutive spaces.
+    while $(MSVCDir[2]) 
+    {
+        MSVCDir = $(MSVCDir[1])" "$(MSVCDir[2]) $(MSVCDir[3-]) ;
+    }
+    
     VC_TOOL_PATH ?= "" ; # Don't clobber adjoining text if MSVCDir is already set
 }
 
diff --git a/v1/msvc-tools.jam b/v1/msvc-tools.jam
index 65bb51c1a..767c0a834 100644
--- a/v1/msvc-tools.jam
+++ b/v1/msvc-tools.jam
@@ -30,6 +30,13 @@ if ! $(MSVCDir)
 }
 else
 {
+    # This hack reconstitutes paths containing spaces as long as
+    # they don't contain any consecutive spaces.
+    while $(MSVCDir[2]) 
+    {
+        MSVCDir = $(MSVCDir[1])" "$(MSVCDir[2]) $(MSVCDir[3-]) ;
+    }
+    
     VC_TOOL_PATH ?= "" ; # Don't clobber adjoining text if MSVCDir is already set
 }