diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 62b2b6e..4596167 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 **Navigation Support Bugfix**
 
-Use relative URLs for site navigation. Ensures that sites hosted on a subpath still link correctly. [#54](https://github.com/encode/mkdocs/pull/54)
+Use relative URLs for site navigation. Ensures that sites hosted on a subpath still link correctly. [#54](https://github.com/encode/mkdocs/pull/54), [#55](https://github.com/encode/mkdocs/pull/55)
 
 ## 2.0.dev4
 
diff --git a/src/mkdocs/theme/base.html b/src/mkdocs/theme/base.html
index d647f36..9e3cfe0 100644
--- a/src/mkdocs/theme/base.html
+++ b/src/mkdocs/theme/base.html
@@ -263,7 +263,7 @@
     <body>
         {% if nav %}
         <nav class="site">
-            {{ nav.html }}
+            {% include "navigation.html" %}
         </nav>
         {% endif %}
         {% if page.toc %}
diff --git a/src/mkdocs/theme/navigation.html b/src/mkdocs/theme/navigation.html
new file mode 100644
index 0000000..0d38f18
--- /dev/null
+++ b/src/mkdocs/theme/navigation.html
@@ -0,0 +1,3 @@
+<ul>
+    {% for item in nav %}<li><a href="{{ item.page.url | url }}"{% if item.page.url == page.url %} class="active"{% endif %}>{{ item.title }}</a></li>{% endfor %}
+</ul>
