diff --git a/v2/Jamroot.jam b/v2/Jamroot.jam
index 421e51a18..e145aad41 100644
--- a/v2/Jamroot.jam
+++ b/v2/Jamroot.jam
@@ -15,7 +15,7 @@ if [ os.on-windows ]
 package.install boost-build-engine boost-build
   : # properties
   : # binaries
-    bjam$(ext)
+    b2$(ext) bjam$(ext)
   ;
 
 local e1 = [ path.glob-tree $(SELF)/example : * : . .svn ] ;
diff --git a/v2/bootstrap.bat b/v2/bootstrap.bat
index 5048a5abd..190c9283d 100644
--- a/v2/bootstrap.bat
+++ b/v2/bootstrap.bat
@@ -14,11 +14,13 @@ call .\build.bat %* > ..\..\bootstrap.log
 @ECHO OFF
 cd ..
 
-if exist ".\engine\bin.ntx86\bjam.exe" (
+if exist ".\engine\bin.ntx86\b2.exe" (
+   copy .\engine\bin.ntx86\b2.exe . > nul
    copy .\engine\bin.ntx86\bjam.exe . > nul
    goto :bjam_built)
 
-if exist ".\engine\bin.ntx86_64\bjam.exe" (
+if exist ".\engine\bin.ntx86_64\b2.exe" (
+   copy .\engine\bin.ntx86_64\b2.exe . > nul
    copy .\engine\bin.ntx86_64\bjam.exe . > nul
    goto :bjam_built)
 
@@ -29,7 +31,7 @@ goto :bjam_failure
 ECHO.
 ECHO Bootstrapping is done. To build, run:
 ECHO.
-ECHO     .\bjam --prefix=DIR install
+ECHO     .\b2 --prefix=DIR install
 ECHO.
 
 goto :end
diff --git a/v2/bootstrap.sh b/v2/bootstrap.sh
index 38bfbdc75..508355173 100755
--- a/v2/bootstrap.sh
+++ b/v2/bootstrap.sh
@@ -105,15 +105,16 @@ if test "x$BJAM" = x; then
   fi
   cd "$pwd"
   arch=`cd $my_dir/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
-  BJAM="$my_dir/engine/$arch/bjam"
+  BJAM="$my_dir/engine/$arch/b2"
   echo "engine/$arch/bjam"
   cp "$BJAM" .
+  cp "$my_dir/engine/$arch/bjam" .
 fi
 
 cat << EOF
 
 Bootstrapping is done. To build and install, run:
 
-    ./bjam install --prefix=<DIR>
+    ./b2 install --prefix=<DIR>
 
 EOF