diff --git a/Jamroot b/Jamroot
index d27aad3934..38b908c135 100644
--- a/Jamroot
+++ b/Jamroot
@@ -152,7 +152,7 @@ project boost
       <toolset>como:<link>static
       <toolset>como-linux:<define>_GNU_SOURCE=1
       # When building docs within Boost, we want the standard Boost style
-      <boostbook-base-style>Boost
+      <xsl:param>boost.defaults=Boost
     : usage-requirements <include>.
     : build-dir bin.v2
     ;
diff --git a/tools/build b/tools/build
index 3667a5b103..83ddcf8f00 160000
--- a/tools/build
+++ b/tools/build
@@ -1 +1 @@
-Subproject commit 3667a5b1037133b1a3f42565d277d17f6333f737
+Subproject commit 83ddcf8f00e96e1b25a3ab93e5d79fcc7a3f8fb5
diff --git a/tools/quickbook b/tools/quickbook
index 5cfddfd116..6c6d0bd2cc 160000
--- a/tools/quickbook
+++ b/tools/quickbook
@@ -1 +1 @@
-Subproject commit 5cfddfd1164c8f0cc965af4f947492528d2b968d
+Subproject commit 6c6d0bd2cc20e061221071491ff14b3b01200942