diff --git a/source/blog/tags.html.twig b/source/blog/tags.html.twig
new file mode 100644
index 00000000..b95319c9
--- /dev/null
+++ b/source/blog/tags.html.twig
@@ -0,0 +1,14 @@
+---
+layout: default
+title: Tags
+nav: blog
+use:
+  - posts_tags
+---
+<h2>Tags</h2>
+
+<ul>
+{% for tag,posts in data.posts_tags %}
+  <li><a href="{{ site.url }}/blog/tags/{{ tag|url_encode(true) }}">{{ tag }}</a></li>
+{% endfor %}
+</ul>
\ No newline at end of file
diff --git a/source/blog/tags/tag.html.twig b/source/blog/tags/tag.html.twig
new file mode 100644
index 00000000..4e83d536
--- /dev/null
+++ b/source/blog/tags/tag.html.twig
@@ -0,0 +1,23 @@
+---
+layout: default
+title: Tag Archive
+nav: blog
+generator:
+  - posts_tag_index
+---
+
+{% block head_meta %}
+    <link rel="alternate" type="application/atom+xml" href="{{ site.url }}/blog/tags/{{ page.tag|url_encode(true) }}.xml" title="{{ site.title }} '{{ page.tag }}' tag feed" />
+    <meta name="robots" content="noindex, follow">
+{% endblock %}
+
+{% block title %}{{ page.title }} "{{ page.tag }}"{% endblock %}
+
+{% block content %}
+  <h2>"{{ page.tag }}"</h2>
+<ul>
+  {% for post in page.tag_posts %}
+      <li><a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a></li>
+  {% endfor %}
+  </ul>
+{% endblock content %}
\ No newline at end of file
diff --git a/source/blog/tag.xml b/source/blog/tags/tag.xml
similarity index 100%
rename from source/blog/tag.xml
rename to source/blog/tags/tag.xml