diff --git a/_config.yml b/_config.yml
index 4a1c3f1d..57af5fb2 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,7 +11,9 @@ 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
@@ -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>