diff --git a/docs_theme/main.html b/docs_theme/main.html
index 1a1175902..07570d6e4 100644
--- a/docs_theme/main.html
+++ b/docs_theme/main.html
@@ -6,7 +6,7 @@
   <meta charset="utf-8">
   <title>{% if page.title %}{{ page.title }} - {% endif %}{{ config.site_name }}</title>
   <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
-  <link rel="canonical" href="{{ page.canonical_url }}" />
+  <link rel="canonical" href="{{ page.canonical_url|url }}" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="Django, API, REST{% if page %}, {{ page.title }}{% endif %}">
   <meta name="author" content="Tom Christie">
@@ -91,12 +91,12 @@
 
                 {% for toc_item in page.toc %}
                   <li class="{% if page and not page.is_homepage %}main{% endif %}">
-                    <a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
+                    <a href="{{ toc_item.url|url }}">{{ toc_item.title }}</a>
                   </li>
 
                   {% for toc_item in toc_item.children %}
                     <li>
-                      <a href="{{ toc_item.url }}">{{ toc_item.title }}</a>
+                      <a href="{{ toc_item.url|url }}">{{ toc_item.title }}</a>
                     </li>
                   {% endfor %}
                 {% endfor %}
diff --git a/docs_theme/nav.html b/docs_theme/nav.html
index 732694f48..d30348756 100644
--- a/docs_theme/nav.html
+++ b/docs_theme/nav.html
@@ -2,10 +2,10 @@
       <div class="navbar-inner">
         <div class="container-fluid">
           <a class="repo-link btn btn-primary btn-small" href="https://github.com/encode/django-rest-framework/tree/master">GitHub</a>
-          <a class="repo-link btn btn-inverse btn-small {% if not page.next_page %}disabled{% endif %}" rel="next" {% if page.next_page %}href="{{ page.next_page.url }}"{% endif %}>
+          <a class="repo-link btn btn-inverse btn-small {% if not page.next_page %}disabled{% endif %}" rel="next" {% if page.next_page %}href="{{ page.next_page.url|url }}"{% endif %}>
             Next <i class="icon-arrow-right icon-white"></i>
           </a>
-          <a class="repo-link btn btn-inverse btn-small {% if not page.previous_page %}disabled{% endif %}" rel="prev" {% if page.previous_page %}href="{{ page.previous_page.url }}"{% endif %}>
+          <a class="repo-link btn btn-inverse btn-small {% if not page.previous_page %}disabled{% endif %}" rel="prev" {% if page.previous_page %}href="{{ page.previous_page.url|url }}"{% endif %}>
             <i class="icon-arrow-left icon-white"></i> Previous
           </a>
           <a id="search_modal_show" class="repo-link btn btn-inverse btn-small" href="#mkdocs_search_modal" data-toggle="modal" data-target="#mkdocs_search_modal"><i class="icon-search icon-white"></i> Search</a>
@@ -25,14 +25,14 @@
                 <ul class="dropdown-menu">
                   {% for nav_item in nav_item.children %}
                   <li {% if nav_item.active %}class="active" {% endif %}>
-                    <a href="{{ nav_item.url }}">{{ nav_item.title }}</a>
+                    <a href="{{ nav_item.url|url }}">{{ nav_item.title }}</a>
                   </li>
                   {% endfor %}
                 </ul>
               </li>
               {% else %}
               <li {% if nav_item.active %}class="active" {% endif %}>
-                <a href="{{ nav_item.url }}">{{ nav_item.title }}</a>
+                <a href="{{ nav_item.url|url }}">{{ nav_item.title }}</a>
               </li>
               {% endif %} {% endfor %}