diff --git a/docs/_config.yml b/docs/_config.yml
index 7eae12aab..e04a681bd 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -9,7 +9,7 @@ lsi: false
 safe: true
 incremental: false
 url: https://puppetlabs.github.io/rspec-puppet
-baseurl: /docs
+baseurl: rspec-puppet
 gist:
     noscript: false
 markdown: kramdown
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index 426521503..e80d7d20f 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -12,13 +12,13 @@
     <meta name="author" content="">    
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
     <!-- Global CSS -->
-    <link rel="stylesheet" href="{{site.url}}/assets/plugins/bootstrap/css/bootstrap.min.css">   
+    <link rel="stylesheet" href="{{site.baseurl}}/assets/plugins/bootstrap/css/bootstrap.min.css">   
     <!-- Plugins CSS -->    
-    <link rel="stylesheet" href="{{site.url}}/assets/plugins/font-awesome/css/font-awesome.css">
+    <link rel="stylesheet" href="{{site.baseurl}}/assets/plugins/font-awesome/css/font-awesome.css">
     
     <!-- Theme CSS -->
-    <link id="theme-style" rel="stylesheet" href="{{site.url}}/assets/css/styles.css">
-    <link rel="stylesheet" href="{{site.url}}/assets/css/monokai.css">
+    <link id="theme-style" rel="stylesheet" href="{{site.baseurl}}/assets/css/styles.css">
+    <link rel="stylesheet" href="{{site.baseurl}}/assets/css/monokai.css">
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
diff --git a/docs/index.html b/docs/index.html
index 95d9af64e..13d4f6223 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -14,13 +14,13 @@
     <meta name="author" content="">    
     <link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
     <!-- Global CSS -->
-    <link rel="stylesheet" href="{{site.url}}/assets/plugins/bootstrap/css/bootstrap.min.css">   
+    <link rel="stylesheet" href="{{site.baseurl}}/assets/plugins/bootstrap/css/bootstrap.min.css">   
     <!-- Plugins CSS -->    
-    <link rel="stylesheet" href="{{site.url}}/assets/plugins/font-awesome/css/font-awesome.css">
-    <link rel="stylesheet" href="{{site.url}}/assets/css/monokai.css">
+    <link rel="stylesheet" href="{{site.baseurl}}/assets/plugins/font-awesome/css/font-awesome.css">
+    <link rel="stylesheet" href="{{site.baseurl}}/assets/css/monokai.css">
     
     <!-- Theme CSS -->
-    <link id="theme-style" rel="stylesheet" href="{{site.url}}/assets/css/styles.css">
+    <link id="theme-style" rel="stylesheet" href="{{site.baseurl}}/assets/css/styles.css">
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
@@ -56,7 +56,7 @@ <h5>(The rest is a bit more difficult though)</h5>
 $ cd your-module
 $ rspec-puppet-init
                         </code></pre></div>
-                    <p>Then continue on to the <a href="{{site.url}}/tutorial">tutorial!</a></p>
+                    <p>Then continue on to the <a href="{{site.baseurl}}/tutorial">tutorial!</a></p>
                     <div class="cta-container">
                         <a class="btn btn-primary btn-cta" href="https://github.com/rodjek/rspec-puppet/" target="_blank"><i class="fa fa-github"></i> View on GitHub</a>
                     </div><!--//cta-container-->
@@ -69,7 +69,7 @@ <h5>(The rest is a bit more difficult though)</h5>
                             </div><!--//icon-holder-->
                             <h3 class="title">Tutorial</h3>
                             <p class="intro">A step-by-step introduction to behaviour-driven Puppet development</p>
-                            <a class="link" href="{{site.url}}/tutorial"><span></span></a>
+                            <a class="link" href="{{sitebase.url}}/tutorial"><span></span></a>
                         </div><!--//item-inner-->
                     </div><!--//item-->
                     <div class="item item-pink item-2 col-md-4 col-sm-6 col-xs-6">
@@ -79,7 +79,7 @@ <h3 class="title">Tutorial</h3>
                             </div><!--//icon-holder-->
                             <h3 class="title">Documentation</h3>
                             <p class="intro">Everything you need to know</p>
-                            <a class="link" href="{{site.url}}/documentation/"><span></span></a>
+                            <a class="link" href="{{site.baseurl}}/documentation/"><span></span></a>
                         </div><!--//item-inner-->
                     </div><!--//item-->
                     <div class="item item-purple col-md-4 col-sm-6 col-xs-6">
@@ -89,7 +89,7 @@ <h3 class="title">Documentation</h3>
                             </div><!--//icon-holder-->
                             <h3 class="title">Changelog</h3>
                             <p class="intro">Check out what's changed in the latest release</p>
-                            <a class="link" href="{{site.url}}/changelog/"><span></span></a>
+                            <a class="link" href="{{site.baseurl}}/changelog/"><span></span></a>
                         </div><!--//item-inner-->
                     </div><!--//item-->
                 </div><!--//cards-->