diff --git a/_src/_assets/styl/content.styl b/_src/_assets/styl/content.styl
index 097bab2f..2f1d1861 100644
--- a/_src/_assets/styl/content.styl
+++ b/_src/_assets/styl/content.styl
@@ -81,7 +81,7 @@
 
 .byline,
 time,
-.categories
+.tags
     @extend .textcenter
 
 .byline,
@@ -99,9 +99,19 @@ time
     display: block
     color: $text-color-dimmed
 
-.categories
+.tags
     margin-top: $line-height-computed
 
+.tag
+    color: $text-color-dimmed
+    margin-right: 5px
+
+    &:before
+        content: '#'
+        color: darken($page-bg, 15%)
+        margin-right: 2px
+
+
 .avatar
     width: 80px
     height: 80px
diff --git a/_src/_includes/entry_meta.html b/_src/_includes/entry_meta.html
index 477293be..f80e577a 100644
--- a/_src/_includes/entry_meta.html
+++ b/_src/_includes/entry_meta.html
@@ -15,4 +15,10 @@
       <time is="time-ago" class="updated" datetime="{{ page.updated | date_to_xmlschema }}">Updated {{ page.updated | date_to_string }}</time>
     {% endif %}
 
+	<p class="tags">
+		{% for tag in page.tags %}
+			<a class="tag" href="/tag/{{ tag }}">{{ tag }}</a> 
+		{% endfor %}
+	</p>
+
 </footer>