diff --git a/blog/templates/index.html b/blog/templates/index.html
index aed91832..7af1c00f 100644
--- a/blog/templates/index.html
+++ b/blog/templates/index.html
@@ -16,7 +16,7 @@
     </p>
     <p>Latest post:
         {% set latest_post = posts|last %}
-        <strong><a href="{{ latest_post.path }}">{{ latest_post.title }}</a></strong>
+        <strong><a href="{{ latest_post.permalink | safe }}">{{ latest_post.title }}</a></strong>
     </p>
 </div>
 
@@ -47,10 +47,10 @@
 <h1>{{ extra.title }}</h1>
 <ul>
     {% for subsection in extra.subsections|reverse %}
-        <li><a href="{{ subsection.path }}">{{ subsection.title }}</a></li>
+        <li><a href="{{ subsection.permalink | safe }}">{{ subsection.title }}</a></li>
     {% endfor %}
     {% for page in extra.pages|reverse %}
-        <li><a href="{{ page.path }}">{{ page.title }}</a></li>
+        <li><a href="{{ page.permalink | safe }}">{{ page.title }}</a></li>
     {% endfor %}
 </ul>
 
diff --git a/blog/templates/macros.html b/blog/templates/macros.html
index 7952f13f..aa62e7fe 100644
--- a/blog/templates/macros.html
+++ b/blog/templates/macros.html
@@ -1,6 +1,6 @@
 {% macro post_link(page) %}
     <article>
-        <h2 class="post-title"><a href="{{ page.path }}">{{ page.title }}</a></h2>
+        <h2 class="post-title"><a href="{{ page.permalink | safe }}">{{ page.title }}</a></h2>
         {{ page.summary | safe }}
     </article>
 {% endmacro post_link %}
diff --git a/blog/templates/page.html b/blog/templates/page.html
index fa7a227c..463e937d 100644
--- a/blog/templates/page.html
+++ b/blog/templates/page.html
@@ -28,10 +28,10 @@
     <hr>
     <div class="PageNavigation">
         {% if page.previous %}
-            <a class="prev" href="{{ page.previous.path }}">&laquo; {{ page.previous.title }}</a>
+            <a class="prev" href="{{ page.previous.permalink | safe }}">&laquo; {{ page.previous.title }}</a>
         {% endif %}
         {% if page.next %}
-            <a class="next" href="{{ page.next.path }}">{{ page.next.title }} &raquo;</a>
+            <a class="next" href="{{ page.next.permalink | safe }}">{{ page.next.title }} &raquo;</a>
         {% endif %}
     </div>