diff --git a/blog/2016-03-31-finding-a-programming-job.markdown b/blog/2016-03-31-finding-a-programming-job.markdown
index 5fef010..34a8254 100644
--- a/blog/2016-03-31-finding-a-programming-job.markdown
+++ b/blog/2016-03-31-finding-a-programming-job.markdown
@@ -3,9 +3,7 @@ layout: post
 title: "Finding a programming job"
 date: 2016-03-31 17:01
 comments: true
-categories: 
- - progamming
- - job
+tags: progamming, job
 ---
 
 **TL;DR** My learning from job hunting as a programmer.
diff --git a/site.hs b/site.hs
index 160d871..58a32ff 100644
--- a/site.hs
+++ b/site.hs
@@ -11,6 +11,8 @@ import           Text.Regex (splitRegex, mkRegex)
 --------------------------------------------------------------------------------
 main :: IO ()
 main = hakyll $ do
+    tags <- extractTags
+
     match "images/*" $ do
         route   idRoute
         compile copyFileCompiler
@@ -56,6 +58,7 @@ main = hakyll $ do
             let indexCtx =
                     listField "posts" postCtx (return $ take 5 posts) `mappend`
                     constField "title" "Home"                `mappend`
+                    tagsField  "tags" tags                   `mappend`
                     defaultContext
 
             getResourceBody
@@ -67,6 +70,11 @@ main = hakyll $ do
 
 
 --------------------------------------------------------------------------------
+extractTags :: Rules Tags
+extractTags = do
+  tags <- buildTags ("blogs/**" .&&. hasNoVersion) $ fromCapture "tags/*.html"
+  return $ sortTagsBy caseInsensitiveTags tags
+
 postCtx :: Context String
 postCtx =
     dateField "date" "%B %e, %Y" `mappend`
diff --git a/templates/post.html b/templates/post.html
index 5f7f210..7336351 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -3,5 +3,10 @@
     <p class="subtitle">$date$</p>
     <section>
         $body$
-        </section>
+    </section>
+    <section>
+        $if(tags)$
+        <br>Posted in <i>$tags$</i>
+        $endif$
+    </section>
 </article>