diff --git a/static/css/poole.css b/static/css/poole.css
index 66cc436..5becc32 100644
--- a/static/css/poole.css
+++ b/static/css/poole.css
@@ -352,6 +352,26 @@ tbody tr:nth-child(odd) th {
   color: #9a9a9a;
 }
 
+.post-tags {
+  display: inline;
+  margin-bottom: 1rem;
+  color: #9a9a9a;
+}
+.post-tags ul {
+  margin: 0;
+  padding: 0;
+  display: inline;
+}
+.post-tags li {
+  display: inline;
+}
+.post-tags li:after {
+  content: ", ";
+}
+.post-tags li:last-child:after {
+  content: "";
+}
+
 /* Related posts */
 .related {
   padding-top: 2rem;
diff --git a/templates/article.html b/templates/article.html
index 79ba5de..de487f8 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -13,6 +13,18 @@
 	<h1 class="post-title">{{ article.title }}</h1>
 	<span class="post-date">{{ article.locale_date }}</span>
 	{{ article.content }}
+
+	{% if article.tags %}
+		<hr>
+		<p><b>Tags:</b></p>
+		
+		<ul>
+			{% for tag in article.tags %}
+			<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
+			{% endfor %}
+		</ul>
+	{% endif %}
+
 	{% include 'fragments/disqus.html' %}
 </div>
 {% endblock %}
diff --git a/templates/index.html b/templates/index.html
index 814b373..f05d9b2 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8,6 +8,16 @@
 					<a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
 				</h1>
 				<span class="post-date">{{ article.locale_date }}</span>
+				{% if article.tags %}
+					<span class="post-tags">
+						Tags:
+						<ul>
+							{% for tag in article.tags %}
+								<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
+							{% endfor %}
+						</ul>
+					</span>
+				{% endif %}
 				<p>
 					{{ article.summary }}
 				</p>