diff --git a/Jamroot b/Jamroot
index 38b908c135..d27aad3934 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
-      <xsl:param>boost.defaults=Boost
+      <boostbook-base-style>Boost
     : usage-requirements <include>.
     : build-dir bin.v2
     ;
diff --git a/tools/build b/tools/build
index 1ca8db235b..dadcde220e 160000
--- a/tools/build
+++ b/tools/build
@@ -1 +1 @@
-Subproject commit 1ca8db235b965697a953a4e16f25bc5704107496
+Subproject commit dadcde220ebf76df3e2ed878799c4483d1eac377
diff --git a/tools/quickbook b/tools/quickbook
index 78b784b859..5cfddfd116 160000
--- a/tools/quickbook
+++ b/tools/quickbook
@@ -1 +1 @@
-Subproject commit 78b784b859978309ce2e6a983bf90762f565d28f
+Subproject commit 5cfddfd1164c8f0cc965af4f947492528d2b968d