diff --git a/LICENSE.md b/LICENSE.md
index a67e37b43..ed3503b6e 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2017 Containous SAS
+Copyright (c) 2016-2018 Containous SAS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/docs/theme/partials/footer.html b/docs/theme/partials/footer.html
index 98cb1e652..e3b586dbe 100644
--- a/docs/theme/partials/footer.html
+++ b/docs/theme/partials/footer.html
@@ -20,7 +20,7 @@
   IN THE SOFTWARE.
 -->
 
-{% import "partials/language.html" as lang %}
+{% import "partials/language.html" as lang with context %}
 
 <!-- Application footer -->
 <footer class="md-footer">
@@ -97,7 +97,7 @@
 
             <!-- Social links -->
             {% block social %}
-            {% include "partials/social.html" %}
+                {% include "partials/social.html" %}
             {% endblock %}
         </div>
     </div>
diff --git a/mkdocs.yml b/mkdocs.yml
index ed65da9ab..c354faeea 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -7,24 +7,14 @@ dev_addr: 0.0.0.0:8000
 repo_name: 'GitHub'
 repo_url: 'https://github.com/containous/traefik'
 
-# Documentation
 docs_dir: 'docs'
 
-#theme: united
-#theme: readthedocs
-theme: 'material'
-#theme: bootstrap
-
-site_favicon: 'img/traefik.icon.png'
-
-copyright: "Copyright &copy; 2016-2017 Containous SAS"
-
-google_analytics:
-  - 'UA-51880359-3'
-  - 'docs.traefik.io'
-
-# Options
-extra:
+theme:
+  name: 'material'
+  custom_dir: 'docs/theme'
+  language: en
+  include_sidebar: true
+  favicon: img/traefik.icon.png
   logo: img/traefik.logo.png
   palette:
     primary: 'blue'
@@ -37,7 +27,16 @@ extra:
   i18n:
     prev: 'Previous'
     next: 'Next'
+
+copyright: "Copyright &copy; 2016-2018 Containous SAS"
+
+google_analytics:
+  - 'UA-51880359-3'
+  - 'docs.traefik.io'
+
+# Options
 # Comment because the call of the CDN is very slow.
+#extra:
 #  social:
 #    - type: 'github'
 #      link: 'https://github.com/containous/traefik'
@@ -48,8 +47,6 @@ extra:
 #    - type: 'twitter'
 #      link: 'https://twitter.com/traefikproxy'
 
-theme_dir: docs/theme/
-
 extra_css:
   - theme/styles/extra.css
   - theme/styles/atom-one-light.css
@@ -60,8 +57,8 @@ extra_javascript:
 
 markdown_extensions:
   - admonition
-#  - codehilite(guess_lang=false)
-  - toc(permalink=true)
+  - toc:
+      permalink: true
 
 # Page tree
 pages:
diff --git a/requirements.txt b/requirements.txt
index 1fdf12311..fea8dd24d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-mkdocs==0.16.3
+mkdocs>=0.17.2
 pymdown-extensions>=1.4
 mkdocs-bootswatch>=0.4.0
-mkdocs-material==1.12.2
+mkdocs-material>=2.2.6