diff --git a/v2/build-system.jam b/v2/build-system.jam
index 5a2d1683d..9d40b424a 100755
--- a/v2/build-system.jam
+++ b/v2/build-system.jam
@@ -46,7 +46,10 @@ if $(test-config) || --ignore-config in [ modules.peek : ARGV ]
     ignore-config = true ;
 }
 
-local user-path = [ modules.peek : HOME ] [ modules.peek : BOOST_BUILD_PATH ] ;        
+local HOME = [ modules.peek : HOME ] ;
+# Bjam breaks vars at spaces -- fix this back.
+HOME = $(HOME:J=" ") ;
+local user-path = $(HOME) [ modules.peek : BOOST_BUILD_PATH ] ;        
     
 # Load site-config.
 module site-config