diff --git a/_layouts/post.html b/_layouts/post.html
index b2e5f312..07006b35 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -9,7 +9,7 @@ <h1 itemprop="name" class="post-title">{{ page.title }}</h1>
     <p class="post-meta">
     {{ site.locales[site.default_locale].PostedInCategories }}
     {% for cat in page.categories %}
-    <a href="{{site.baseurl}}/categories/#{{ cat }}">{{ cat }}</a><!--&nbsp;-->
+    <a href="{{site.baseurl}}/categories/#{{ cat }}">{{ cat }}</a>{% unless page.categories.last == cat %}, {% endunless %}
     {% endfor %} 
     {% if page.tags != empty %}
     {{ site.locales[site.default_locale].Taggedwith }}
diff --git a/index.html b/index.html
index a32455dc..f7dafa92 100644
--- a/index.html
+++ b/index.html
@@ -15,7 +15,7 @@ <h1 itemprop="name" class="post-title">
       <p class="post-meta">
       {{ site.locales[site.default_locale].PostedInCategories }}
       {% for cat in post.categories %}
-      <a href="{{site.baseurl}}/categories/#{{ cat }}">{{ cat }}</a><!--&nbsp;-->
+      <a href="{{site.baseurl}}/categories/#{{ cat }}">{{ cat }}</a>{% unless post.categories.last == cat%}, {% endunless %}
       {% endfor %}
       {% if post.tags != empty %}
       {{ site.locales[site.default_locale].Taggedwith }}