diff --git a/pelican/themes/notmyidea/templates/article.html b/pelican/themes/notmyidea/templates/article.html
index 86b63231..8b5e5bae 100644
--- a/pelican/themes/notmyidea/templates/article.html
+++ b/pelican/themes/notmyidea/templates/article.html
@@ -16,7 +16,8 @@
                         By <a class="url fn" href="#">{{ article.author }}</a>
                 </address>
                 {% endif %}
-                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+                <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. 
+        {% include 'taglist.html' %}
         </footer><!-- /.post-info -->
         {{ article.content }}
         </div><!-- /.entry-content -->
@@ -37,4 +38,4 @@
 
 </article>
 </section>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index d01e9928..2f61d6d5 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -18,6 +18,7 @@
                         </address>
                         {% endif %}
                 <p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+                {% include 'taglist.html' %}
                 </footer><!-- /.post-info -->
                 {{ article.content }}
         </article></aside><!-- /#featured -->
@@ -43,6 +44,7 @@
                                 By <a class="url fn" href="#">{{ article.author }}</a>
                         </address>
                         <p> In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
+                        {% include 'taglist.html' %}
                     <p>{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">pdf</a>{% endif %}</p>
                 </footer><!-- /.post-info -->
                 {{ article.summary }}
diff --git a/pelican/themes/notmyidea/templates/taglist.html b/pelican/themes/notmyidea/templates/taglist.html
new file mode 100644
index 00000000..4259077a
--- /dev/null
+++ b/pelican/themes/notmyidea/templates/taglist.html
@@ -0,0 +1,2 @@
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>