diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 91aa36fe..3fb9ec52 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -10,25 +10,25 @@
       {% endif %}
     </title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="{{ page.baseurl }}css/vendor/bootstrap.min.css" rel="stylesheet">
-    <link href="{{ page.baseurl }}css/main.css" rel="stylesheet">
-    <link href="{{ page.baseurl }}css/vendor/lang-eiffel.css" rel="stylesheet">
+    <link href="{{ site.url }}/css/vendor/bootstrap.min.css" rel="stylesheet">
+    <link href="{{ site.url }}/css/main.css" rel="stylesheet">
+    <link href="{{ site.url }}/css/vendor/lang-eiffel.css" rel="stylesheet">
   </head>
   <body>
     <div class="container-narrow">
       <div class="masthead">
         <ul class="nav nav-pills pull-right">
           <li{% if page.title == "EiffelWeb" %} class="active"{% endif %}>
-            <a href="{{ page.baseurl }}index.html">Home</a>
+            <a href="{{ site.url }}">Home</a>
           </li>
           <li{% if page.title == "Getting Started" %} class="active"{% endif %}>
-            <a href="{{ page.baseurl }}getting-started">Getting Started</a>
+            <a href="{{ site.url }}/getting-started">Getting Started</a>
           </li>
           <li{% if page.title == "Community" %} class="active"{% endif %}>
-            <a href="{{ page.baseurl }}community">Community</a>
+            <a href="{{ site.url }}/community">Community</a>
           </li>
           <li{% if page.title == "Documentation" %} class="active"{% endif %}>
-            <a href="{{ page.baseurl }}workbook/readme">Documentation</a>
+            <a href="{{ site.url }}/workbook/readme">Documentation</a>
           </li>
         </ul>
         <h3 class="muted">EiffelWeb</h3>
@@ -40,10 +40,10 @@
         <p>&copy; EiffelWeb framework 2012-2017</p>
       </div>
     </div> <!-- /container -->
-    <script src="{{ page.baseurl }}js/vendor/jquery.min.js"></script>
-    <script src="{{ page.baseurl }}js/vendor/bootstrap.min.js"></script>
+    <script src="{{ site.url }}/js/vendor/jquery.min.js"></script>
+    <script src="{{ site.url }}/js/vendor/bootstrap.min.js"></script>
     <script src="http://platform.twitter.com/widgets.js"></script>
-    <script src="{{ page.baseurl }}js/vendor/run_prettify.js"></script>
-    <script src="{{ page.baseurl }}js/vendor/lang-eiffel.js"></script>
+    <script src="{{ site.url }}/js/vendor/run_prettify.js"></script>
+    <script src="{{ site.url }}/js/vendor/lang-eiffel.js"></script>
   </body>
 </html>
diff --git a/docs/community.html b/docs/community.html
index 173e091e..ccf631e5 100644
--- a/docs/community.html
+++ b/docs/community.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Community
-base_url: "../"
----
       <div class="row">
         <div class="col-md-4">
           <h2>Twitter</h2>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 12fd337c..80924db0 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: Getting Started
-base_url: "../"
----
       <div class="row">
         <div class="col-md-12">
           <div class="page-header">
@@ -39,7 +34,7 @@ base_url: "../"
               <li>located in <i>$ISE_EIFFEL/contrib/examples/web/ewf</i></li>
               <li><a href="https://github.com/EiffelWebFramework/ewf_examples">available on Github</a></li>
             </ul>
-            <li>Read the <a href="{{ page.base_url }}workbook/workbook">Overview</a></li>
+            <li>Read the <a href="{{ site.url }}/workbook/readme">Overview</a></li>
           </ul>
         </div>
       </div>
diff --git a/docs/index.html b/docs/index.html
index 096e02cf..f55c804a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,8 +1,3 @@
----
-layout: default
-title: EiffelWeb framework
-base_url: "./"
----
       <div class="jumbotron">
         <h1>EiffelWeb</h1>
         <p class="lead">
