diff --git a/doc/Jamfile b/doc/Jamfile
index 7eb23de7..1df3373b 100644
--- a/doc/Jamfile
+++ b/doc/Jamfile
@@ -94,7 +94,6 @@ else
 #
 make extract-xml-pages.xsl      : docca/include/docca/extract-xml-pages.xsl      : @copy_script ;
 make base-extract-xml-pages.xsl : docca/include/docca/base-extract-xml-pages.xsl : @copy_script ;
-make config.xsl                 : docca/include/docca/config.xsl                 : @copy_script ;
 make common.xsl                 : docca/include/docca/common.xsl                 : @copy_script ;
 make stage1.xsl                 : docca/include/docca/stage1.xsl                 : @copy_script ;
 make base-stage1.xsl            : docca/include/docca/base-stage1.xsl            : @copy_script ;
@@ -102,13 +101,22 @@ make stage2.xsl                 : docca/include/docca/stage2.xsl
 make assemble-quickbook.xsl     : docca/include/docca/assemble-quickbook.xsl     : @copy_script ;
 make emphasized-types.xsl       : docca/include/docca/emphasized-types.xsl       : @copy_script ;
 
-# Beginning (failed) attempt to make all the xslt-visualizer code available
-#make xslt-visualizer : docca/include/xslt-visualizer : @copy_dir ;
-#
-#actions copy_dir
-#{
-#    cp -r $(2[1]) $(1)
-#}
+make config.xsl
+    :
+        docca/include/docca/config.xsl
+        xsl/config.xsl
+        xsl/class_detail.xsl
+        xsl/includes.xsl
+    :
+        @make_config
+    ;
+
+actions make_config
+{
+    cp $(2[1]) $(1)
+    sed -i -e "/<!-- CONFIG_TEMPLATE -->/{r $(2[2])" -e "d}" $(1)
+    sed -i -e "/<!-- INCLUDES_FOOT_TEMPLATE -->/{r $(2[4])" -e "d}" $(1)
+}
 
 # Make a copy of the given file.
 #
diff --git a/doc/docca b/doc/docca
index 457bd23c..56f09f9f 160000
--- a/doc/docca
+++ b/doc/docca
@@ -1 +1 @@
-Subproject commit 457bd23cf7aa236fecf7287ba1ab73bf06a33bcd
+Subproject commit 56f09f9fda80dd15a5148db14cfe5fe5e508aedb
diff --git a/doc/xsl/config.xsl b/doc/xsl/config.xsl
index 798a532c..cdbe93f7 100644
--- a/doc/xsl/config.xsl
+++ b/doc/xsl/config.xsl
@@ -1,6 +1,6 @@
 <!-- Variables (Edit for your project) -->
-<xsl:variable name="doc-ref" select="'beast.ref.'"/>
 <xsl:variable name="doc-ns" select="'boost::beast'"/>
+<xsl:variable name="doc-ref" select="'beast.ref'"/>
 <xsl:variable name="debug" select="0"/>
 <xsl:variable name="private" select="0"/>
 <!-- End Variables -->
diff --git a/doc/xsl/includes.xsl b/doc/xsl/includes.xsl
index a84b5e77..8660e7e1 100644
--- a/doc/xsl/includes.xsl
+++ b/doc/xsl/includes.xsl
@@ -1,5 +1,8 @@
-<!-- INCLUDES_TEMPLATE BEGIN -->
-  <xsl:text>Defined in header [include_file </xsl:text>
-  <xsl:value-of select="substring-after($file,'include/')"/>
-  <xsl:text>]&#xd;&#xd;</xsl:text>
-<!-- INCLUDES_TEMPLATE END -->
+<!-- INCLUDES_FOOT_TEMPLATE BEGIN -->
+<xsl:template mode="convenience-header" match="@file[contains(., 'boost/beast/core')]"     >core.hpp</xsl:template>
+<xsl:template mode="convenience-header" match="@file[contains(., 'boost/beast/http')]"     >http.hpp</xsl:template>
+<xsl:template mode="convenience-header" match="@file[contains(., 'boost/beast/ssl')]"      >ssl.hpp</xsl:template>
+<xsl:template mode="convenience-header" match="@file[contains(., 'boost/beast/websocket')]">websocket.hpp</xsl:template>
+<xsl:template mode="convenience-header" match="@file[contains(., 'boost/beast/zlib')]"     >zlib.hpp</xsl:template>
+<xsl:template mode="convenience-header" match="@file"/>
+<!-- INCLUDES_FOOT_TEMPLATE END -->
diff --git a/doc/xsl/includes_foot.xsl b/doc/xsl/includes_foot.xsl
deleted file mode 100644
index f50c71d5..00000000
--- a/doc/xsl/includes_foot.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- INCLUDES_FOOT_TEMPLATE BEGIN -->
-  <xsl:choose>
-    <xsl:when test="contains($file, 'boost/beast/core')">
-      <xsl:text>&#xd;&#xd;Convenience header [include_file boost/beast/core.hpp]&#xd;</xsl:text>
-    </xsl:when>
-    <xsl:when test="contains($file, 'boost/beast/http')">
-      <xsl:text>&#xd;&#xd;Convenience header [include_file boost/beast/http.hpp]&#xd;</xsl:text>
-    </xsl:when>
-    <xsl:when test="contains($file, 'boost/beast/ssl')">
-      <xsl:text>&#xd;&#xd;Convenience header [include_file boost/beast/ssl.hpp]&#xd;</xsl:text>
-    </xsl:when>
-    <xsl:when test="contains($file, 'boost/beast/websocket')">
-      <xsl:text>&#xd;&#xd;Convenience header [include_file boost/beast/websocket.hpp]&#xd;</xsl:text>
-    </xsl:when>
-    <xsl:when test="contains($file, 'boost/beast/zlib')">
-      <xsl:text>&#xd;&#xd;Convenience header [include_file boost/beast/zlib.hpp]&#xd;</xsl:text>
-    </xsl:when>
-  </xsl:choose>
-<!-- INCLUDES_FOOT_TEMPLATE END -->