diff --git a/README.md b/README.md
index 066f7df5..a2099b3c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # MDAnalysis Web Site
 
-The home page [www.mdanalysis.org](http://www.mdanalysis.org) is maintained as
+The home page [www.mdanalysis.org](https://www.mdanalysis.org) is maintained as
 a [GitHub pages](https://pages.github.com) site. The home page is also
-accessible as [mdanalysis.github.io](http://mdanalysis.github.io).
+accessible as [mdanalysis.github.io](https://mdanalysis.github.io).
 
 
-## Blog [blog.mdanalysis.org](http://blog.mdanalysis.org)
+## Blog [blog.mdanalysis.org](https://blog.mdanalysis.org)
 
 Check out the repository, edit the pages under `_posts`, and push
 commits. The published pages are on the *master* branch.
@@ -66,13 +66,13 @@ including MathJax.
 Drop images into the `public/images` directory and include them like
 
 ```html
-  <img src="{{site.images}}imagename.png"
+  <img src="{{site.images}}/imagename.png"
    style="float: right" alt="alternative text" width="30%"/>
    ```
 
 or use Markdown
 ```markdown
-![alternative text]({{site.images}}imagename.png)
+![alternative text]({{site.images}}/imagename.png)
 ```
 
 
diff --git a/_config.yml b/_config.yml
index 4a1c3f1d..77d5fed0 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,16 +11,18 @@ name:             MDAnalysis
 tagline:          A Python package for the analysis of molecular dynamics simulations.
 description:      A Python package for the analysis of molecular dynamics simulations.
 url:              https://www.mdanalysis.org
-baseurl:          /
+# leave baseurl empty,
+# see https://github.com/MDAnalysis/MDAnalysis.github.io/issues/16#issuecomment-385572553
+baseurl:          
 author:
   name:           The MDAnalysis Team
   url:            https://twitter.com/mdanalysis
   email:          mdnalysis-devel@googlegroups.com
 
-images:           /public/images/
+images:           /public/images
 data:             /public/data
 js:               /js
-blog:             /blog/
+blog:             /blog
 
 # see https://help.github.com/articles/adding-jekyll-plugins-to-a-github-pages-site/
 gems:
@@ -65,3 +67,6 @@ twitter:
   url:            https://twitter.com/mdanalysis
 
 
+algolia:
+  index_name: mdanalysis
+  read_only_api_key: 307d780013d06fdde7a4eae462db0e74
diff --git a/_includes/footer.html b/_includes/footer.html
new file mode 100644
index 00000000..79e27887
--- /dev/null
+++ b/_includes/footer.html
@@ -0,0 +1,12 @@
+
+
+<!-- Algolia DocSearch https://community.algolia.com/docsearch/ -->
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script> 
+<script type="text/javascript"> docsearch({ 
+apiKey: '{{ site.algolia.read_only_api_key }}', 
+indexName: '{{ site.algolia.index_name }}', 
+inputSelector: 'input[type=text]', 
+debug: true // Set debug to true if you want to inspect the dropdown 
+}); 
+</script>
+
diff --git a/_includes/head.html b/_includes/head.html
index 8ff010fe..413d151e 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -37,6 +37,9 @@
      anchors.add('h1, h2, h3, h4, h5, h6');
      });
   </script>
+
+  <!-- Algolia DocSearch https://community.algolia.com/docsearch/ -->
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" /> 
   
   <!-- Google Analytics -->
   <script>
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 050809e2..e3d4f9ad 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -9,6 +9,8 @@ <h1>
       <p class="lead">{{ site.description }}</p>
     </div>
 
+    <input type="text" class="searchbox" autocomplete="off" name="query" placeholder="Search mdanalysis.org..." />
+
     <nav class="sidebar-nav">
       <a class="sidebar-nav-item{% if page.url == site.baseurl %} active{% endif %}" href="{{ site.baseurl }}/">Home</a>
 
diff --git a/_layouts/default.html b/_layouts/default.html
index 040a1a33..6e5959f2 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -11,5 +11,6 @@
       {{ content }}
     </div>
 
+    {% include footer.html %}
   </body>
 </html>
diff --git a/_posts/2015-12-15-The_benefit_of_social_coding.md b/_posts/2015-12-15-The_benefit_of_social_coding.md
index 0e93be56..13ee7f4c 100644
--- a/_posts/2015-12-15-The_benefit_of_social_coding.md
+++ b/_posts/2015-12-15-The_benefit_of_social_coding.md
@@ -19,7 +19,7 @@ possibly gain?
 
 In turns out, a lot.
 
-<img src="{{site.images}}mdanalysis_history_small.png"
+<img src="{{site.images}}/mdanalysis_history_small.png"
 style="center" alt="MDAnalysis commit history (Jan 2008 to Sept 2015)" 
 width="100%"/>
 
diff --git a/_posts/2017-03-01-numfocus.md b/_posts/2017-03-01-numfocus.md
index be276713..07319f4e 100644
--- a/_posts/2017-03-01-numfocus.md
+++ b/_posts/2017-03-01-numfocus.md
@@ -3,7 +3,7 @@ layout: post
 title: MDAnalysis is a NumFOCUS affiliated project
 ---
 <img
-src="{{site.images}}numfocus.png"
+src="{{site.images}}/numfocus.png"
 title="NumFOCUS Foundation" alt="NumFOCUS Foundation"
 style="float: right; width: 10em;" />
 
diff --git a/_posts/2017-03-02-gsoc2017.md b/_posts/2017-03-02-gsoc2017.md
index bbbce55d..231a06e6 100644
--- a/_posts/2017-03-02-gsoc2017.md
+++ b/_posts/2017-03-02-gsoc2017.md
@@ -5,7 +5,7 @@ title: Google Summer of Code 2017
 
 <p>
 <img
-src="{{site.images}}numfocus.png"
+src="{{site.images}}/numfocus.png"
 title="NumFOCUS Foundation" alt="NumFOCUS Foundation"
 style="float: right; width: 10em;" />
 
diff --git a/_posts/2017-06-03-numfocus-grant.md b/_posts/2017-06-03-numfocus-grant.md
index e1bf5fe3..692e3607 100644
--- a/_posts/2017-06-03-numfocus-grant.md
+++ b/_posts/2017-06-03-numfocus-grant.md
@@ -3,7 +3,7 @@ layout: post
 title: NumFOCUS small grant for Python 3 support
 ---
 <img
-src="{{site.images}}numfocus.png"
+src="{{site.images}}/numfocus.png"
 title="NumFOCUS Foundation" alt="NumFOCUS Foundation"
 style="float: right; width: 10em;" />
 
diff --git a/_posts/2018-02-14-gsoc2018.md b/_posts/2018-02-14-gsoc2018.md
index ae600b5b..15f90bbb 100644
--- a/_posts/2018-02-14-gsoc2018.md
+++ b/_posts/2018-02-14-gsoc2018.md
@@ -5,7 +5,7 @@ title: Google Summer of Code 2018
 
 <p>
 <img
-src="{{site.images}}numfocus.png"
+src="{{site.images}}/numfocus.png"
 title="NumFOCUS Foundation" alt="NumFOCUS Foundation"
 style="float: right; width: 10em;" />
 
diff --git a/blog/index.html b/blog/index.html
index 393bcd54..2a087bde 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -21,15 +21,15 @@ <h1 class="post-title">
 
 <div class="pagination">
   {% if paginator.next_page %}
-    <a class="pagination-item older" href="{{site.blog}}page{{paginator.next_page}}">Older</a>
+    <a class="pagination-item older" href="{{site.blog}}/page{{paginator.next_page}}">Older</a>
   {% else %}
     <span class="pagination-item older">Older</span>
   {% endif %}
   {% if paginator.previous_page %}
     {% if paginator.page == 2 %}
-      <a class="pagination-item newer" href="{{site.blog}}">Newer</a>
+      <a class="pagination-item newer" href="{{site.blog}}/">Newer</a>
     {% else %}
-      <a class="pagination-item newer" href="{{site.blog}}page{{paginator.previous_page}}">Newer</a>
+      <a class="pagination-item newer" href="{{site.blog}}/page{{paginator.previous_page}}">Newer</a>
     {% endif %}
   {% else %}
     <span class="pagination-item newer">Newer</span>