diff --git a/_data/tags.yml b/_data/tags.yml
new file mode 100644
index 0000000..5adaa2c
--- /dev/null
+++ b/_data/tags.yml
@@ -0,0 +1,6 @@
+- slug: finnish
+  name: in Finnish
+- slug: english
+  name: in English
+- slug: irc
+  name: IRC
diff --git a/_layouts/blog_by_tag.html b/_layouts/blog_by_tag.html
new file mode 100644
index 0000000..4083345
--- /dev/null
+++ b/_layouts/blog_by_tag.html
@@ -0,0 +1,11 @@
+<h1>Articles by tag :{{ page.tag }}</h1>
+<div>
+    {% if site.tags[page.tag] %}
+        {% for post in site.tags[page.tag] %}
+            <a href="{{ post.url }}/">{{ post.title }}</a>
+        {% endfor %}
+    {% else %}
+        <p>There are no posts for this tag.</p>
+    {% endif %}
+</div>
+
diff --git a/_layouts/post.html b/_layouts/post.html
index a2b4e52..16c614a 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,6 +1,22 @@
 ---
 layout: default
 ---
+{% if post.tags.size > 0 %}
+    {% capture tags_content %}Posted with {% if post.tags.size == 1 %}<i class="fa fa-tag"></i>{% else %}<i class="fa fa-tags"></i>{% endif %}: {% endcapture %}
+    {% for post_tag in post.tags %}
+        {% for data_tag in site.data.tags %}
+            {% if data_tag.slug == post_tag %}
+                {% assign tag = data_tag %}
+            {% endif %}
+        {% endfor %}
+        {% if tag %}
+            {% capture tags_content_temp %}{{ tags_content }}<a href="/blog/tag/{{ tag.slug }}/">{{ tag.name }}</a>{% if forloop.last == false %}, {% endif %}{% endcapture %}
+            {% assign tags_content = tags_content_temp %}
+        {% endif %}
+    {% endfor %}
+{% else %}
+    {% assign tags_content = '' %}
+{% endif %}
 <div class="post">
 
   <header class="post-header">
@@ -10,6 +26,7 @@ layout: default
 
   <article class="post-content">
     {{ content }}
+    <p id="post-meta">{{ tags_content }}</p>
   </article>
 
 </div>
diff --git a/_posts/2014-12-30-test.md b/_posts/2014-12-30-test.md
index 881535f..e812ef2 100644
--- a/_posts/2014-12-30-test.md
+++ b/_posts/2014-12-30-test.md
@@ -2,7 +2,7 @@
 layout: post
 title: Testing...
 category: [english]
-tags: [test, english]
+tags: [english]
 ---
 
 It seems that I started trying the blog feature of Jekyll too.
diff --git a/_posts/2014-12-30-testi.md b/_posts/2014-12-30-testi.md
index d531a52..8cee777 100644
--- a/_posts/2014-12-30-testi.md
+++ b/_posts/2014-12-30-testi.md
@@ -2,7 +2,7 @@
 layout: post
 title: Kokeilua...
 category: [finnish]
-tags: [testi, finnish]
+tags: [finnish]
 ---
 
 Vaikuttaa siltä, että aloitin myös Jekyllin bloggaustoiminnon kokeilun.
diff --git a/_posts/2015-01-10-channels-hostmask-groups-a-basic-howto.md b/_posts/2015-01-10-channels-hostmask-groups-a-basic-howto.md
index b064de5..d75b488 100644
--- a/_posts/2015-01-10-channels-hostmask-groups-a-basic-howto.md
+++ b/_posts/2015-01-10-channels-hostmask-groups-a-basic-howto.md
@@ -2,7 +2,7 @@
 layout: post
 title: "Channels & Hostmask groups: A basic Howto"
 category: [english]
-tags: [oper, irc, groupserv, hostserv]
+tags: [irc, english]
 ---
 
 @Annwenn got me opering at her network after long pause with my opering.
diff --git a/_posts/2015-01-24-getting_help_with_channel_issues.md b/_posts/2015-01-24-getting_help_with_channel_issues.md
index f883b49..124c9c1 100644
--- a/_posts/2015-01-24-getting_help_with_channel_issues.md
+++ b/_posts/2015-01-24-getting_help_with_channel_issues.md
@@ -2,7 +2,7 @@
 layout: post
 title: "Getting help from network operators with channel issues when ops are away"
 category: [english]
-tags: [oper, irc, groupserv, hostserv]
+tags: [irc, english]
 ---
 
 In case you wish network operators to help you when your channel operators