diff --git a/src/theme/book.js b/src/theme/book.js
index 231b02ab..0d71a197 100644
--- a/src/theme/book.js
+++ b/src/theme/book.js
@@ -55,11 +55,12 @@ $( document ).ready(function() {
     // Add anchors for all content headers
     content.find("h1, h2, h3, h4, h5").wrap(function(){
         var wrapper = $("<a class=\"header\">");
-        wrapper.attr("name", $(this).text());
+        var header_name = $(this).text().trim().replace(/\W/g, '-')
+        wrapper.attr("name", header_name);
         // Add so that when you click the link actually shows up in the url bar...
         // Remove any existing anchor then append the new one
         // ensuring eg. no spaces are present within it ie. they become %20
-        wrapper.attr("href", $(location).attr('href').split("#")[0] + "#" + encodeURIComponent($(this).text().trim()) );
+        wrapper.attr("href", $(location).attr('href').split("#")[0] + "#" + header_name );
         return wrapper;
     });