diff --git a/composer.lock b/composer.lock
index 2336c10ff..e6e417d3b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -587,16 +587,16 @@
         },
         {
             "name": "silverstripe/docsviewer",
-            "version": "2.0.0-beta6",
+            "version": "2.0.0-beta7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
-                "reference": "4b618c139c6fdb614208b2e7621261411482829d"
+                "reference": "a10cdd35f75d9c2cf5b43189de3a6fe2acead425"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/4b618c139c6fdb614208b2e7621261411482829d",
-                "reference": "4b618c139c6fdb614208b2e7621261411482829d",
+                "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/a10cdd35f75d9c2cf5b43189de3a6fe2acead425",
+                "reference": "a10cdd35f75d9c2cf5b43189de3a6fe2acead425",
                 "shasum": ""
             },
             "require": {
@@ -625,7 +625,7 @@
                 "documentation",
                 "silverstripe"
             ],
-            "time": "2017-06-29T00:25:02+00:00"
+            "time": "2017-08-14T04:33:49+00:00"
         },
         {
             "name": "silverstripe/dynamodb",
diff --git a/themes/docs/templates/Includes/DocumentationHead.ss b/themes/docs/templates/Includes/DocumentationHead.ss
index 70e4c8d52..d5d9e9811 100644
--- a/themes/docs/templates/Includes/DocumentationHead.ss
+++ b/themes/docs/templates/Includes/DocumentationHead.ss
@@ -6,6 +6,9 @@
 
 	<% include DocumentationFavicons %>
 
+	<% if $CanonicalUrl %>
+		<link rel="canonical" href="$CanonicalUrl" />
+	<% end_if %>
 	<link rel="stylesheet" href="$ThemeDir/css/ionicons.min.css" />
 	<link rel="stylesheet" href="$ThemeDir/css/styles.css" />
 	<script type="text/javascript" src="//use.typekit.net/emt4dhq.js"></script>