diff --git a/src/includes/layouts/post.njk b/src/includes/layouts/post.njk
index a5cb631..0174d68 100644
--- a/src/includes/layouts/post.njk
+++ b/src/includes/layouts/post.njk
@@ -5,4 +5,8 @@ layout: base
 <article>
   <h2>{{ title }}</h2>
   {{ content | safe }}
+  {% for tag in tags %}
+  {% set tagUrl %}/tags/{{ tag | slug }}/{% endset %}
+  <a href="{{ tagUrl | url }}">{{ tag }}</a>
+  {% endfor %}
 </article>
diff --git a/src/tags.njk b/src/tags.njk
index 70139d9..ffa892d 100644
--- a/src/tags.njk
+++ b/src/tags.njk
@@ -1,3 +1,23 @@
 ---
-layout: layouts/base
----
\ No newline at end of file
+layout: base
+title: Tags
+pagination:
+    data: collections
+    size: 3
+    alias: tag
+    filter:
+      - all
+    permalink: /tags/{{ tag }}/
+---
+
+<h2>Posts filed under “{{ tag }}”</h2>
+<ul>
+    {% set postlist = collections[ tag ] %} 
+    {% for post in postlist | reverse %}
+    <li>
+        <a href="{{ post.url | url }}">{{ post.data.title }}</a>
+        <time>{{ post.date }}</time>
+    </li>
+    {% endfor %}
+</ul>
+<p>See <a href="{{ '/tags/' | url }}">all tags</a>.</p>
\ No newline at end of file