diff --git a/boost-build.jam b/boost-build.jam
index b7e659c80b..5bb097550b 100644
--- a/boost-build.jam
+++ b/boost-build.jam
@@ -8,7 +8,7 @@
 BOOST_ROOT = $(.boost-build-file:D) ;
 if --v2 in $(ARGV)
 {
-    JAMFILE = [Jj]amfile.v2 ;
+    JAMFILE = [Bb]uild.jam [Jj]amfile.v2 ;
     boost-build tools/build/v2 ;
 }
 else
diff --git a/tools/build b/tools/build
index c5dd88e8f3..1216016204 160000
--- a/tools/build
+++ b/tools/build
@@ -1 +1 @@
-Subproject commit c5dd88e8f32203889b4e6f088d6a018dc32f278c
+Subproject commit 1216016204862d5172b8eff473dc3f5b993583ec