diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c55fe9a..1c5b2258 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 100:
 
 * Fix doc convenience includes
+* Fix doc includes
 
 --------------------------------------------------------------------------------
 
diff --git a/doc/qbk/00_main.qbk b/doc/qbk/00_main.qbk
index 13059239..e138c0e3 100644
--- a/doc/qbk/00_main.qbk
+++ b/doc/qbk/00_main.qbk
@@ -25,8 +25,9 @@
 [template mdash[] '''— ''']
 [template indexterm1[term1] '''<indexterm><primary>'''[term1]'''</primary></indexterm>''']
 [template indexterm2[term1 term2] '''<indexterm><primary>'''[term1]'''</primary><secondary>'''[term2]'''</secondary></indexterm>''']
-[template repo_file[path] '''<ulink url="https://github.com/boostorg/beast/blob/master/'''[path]'''">'''[path]'''</ulink>''']
-[template include_file[path][^<'''<ulink url="https://github.com/boostorg/beast/blob/master/include/'''[path]'''">'''[path]'''</ulink>'''>]]
+
+[template repo_file[path] '''<ulink url="../../'''[path]'''">'''[path]'''</ulink>''']
+[template include_file[path][^<'''<ulink url="../../../../'''[path]'''">'''[path]'''</ulink>'''>]]
 
 [def __N3747__                  [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3747.pdf [*N3747]]]
 [def __N4588__                  [@http://cplusplus.github.io/networking-ts/draft.pdf [*N4588]]]
diff --git a/doc/source.dox b/doc/source.dox
index f1a87040..86e85dd7 100644
--- a/doc/source.dox
+++ b/doc/source.dox
@@ -16,8 +16,8 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = YES
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = $(LIB_DIR)/include
-STRIP_FROM_INC_PATH    = 
+#STRIP_FROM_PATH        = $(LIB_DIR)/include # Requires doxygen 1.8.7+
+STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 QT_AUTOBRIEF           = NO
diff --git a/doc/xsl/includes.xsl b/doc/xsl/includes.xsl
index 6f48e5fe..8d0bc903 100644
--- a/doc/xsl/includes.xsl
+++ b/doc/xsl/includes.xsl
@@ -1,5 +1,5 @@
 <!-- INCLUDES_TEMPLATE BEGIN -->
   <xsl:text>Defined in header [include_file </xsl:text>
-  <xsl:value-of select="$file"/>
+  <xsl:value-of select="substring-after($file,'/include/')"/>
   <xsl:text>]&#xd;&#xd;</xsl:text>
 <!-- INCLUDES_TEMPLATE END -->