diff --git a/djangocms_blog/templates/djangocms_blog/includes/blog_item.html b/djangocms_blog/templates/djangocms_blog/includes/blog_item.html
index 3a44085..71605a2 100644
--- a/djangocms_blog/templates/djangocms_blog/includes/blog_item.html
+++ b/djangocms_blog/templates/djangocms_blog/includes/blog_item.html
@@ -5,30 +5,7 @@
     <header>
         <h3><a href="{{ post.get_absolute_url }}">{{ post.title }}</a></h3>
 		{% block blog_meta %}
-            <ul class="post-detail">
-				{% if post.author %}
-                <li>
-                    {% trans "by" %} <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}">{% if post.author.get_full_name %}{{ post.author.get_full_name }}{% else %}{{ post.author }}{% endif %}</a>
-                </li>
-				{% endif %}
-                <li>
-                    {{ post.date_published|date:"M d, Y" }}
-                </li>
-            </ul>
-            <ul class="post-detail tags">
-                {% if post.categories.exists %}
-                    {% for category in post.categories.all %}
-                        {% if category.slug %}
-                            <li class="category_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-category' category=category.slug %}" class="blog-categories-{{ category.count }}">{{ category.name }}</a>{% if not forloop.last %}, {% endif %}</li>
-                        {% endif %}
-                    {% endfor %}
-			    {% endif %}
-                {% if post.tags.exists %}
-                    {% for tag in post.tags.all %}
-                        <li class="tag_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag blog-tag-{{ tag.count }}">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}</li>
-                    {% endfor %}
-			    {% endif %}
-            </ul>
+			{% include "djangocms_blog/includes/blog_meta.html" %}
 		{% endblock %}
     </header>
     {% if image and post.main_image %}
diff --git a/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html b/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html
new file mode 100644
index 0000000..8be90e3
--- /dev/null
+++ b/djangocms_blog/templates/djangocms_blog/includes/blog_meta.html
@@ -0,0 +1,27 @@
+{% load i18n thumbnail cms_tags %}
+{% load url from future %}
+
+<ul class="post-detail">
+    {% if post.author %}
+    <li>
+        {% trans "by" %} <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}">{% if post.author.get_full_name %}{{ post.author.get_full_name }}{% else %}{{ post.author }}{% endif %}</a>
+    </li>
+    {% endif %}
+    <li>
+        {{ post.date_published|date:"M d, Y" }}
+    </li>
+</ul>
+<ul class="post-detail tags">
+    {% if post.categories.exists %}
+        {% for category in post.categories.all %}
+            {% if category.slug %}
+                <li class="category_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-category' category=category.slug %}" class="blog-categories-{{ category.count }}">{{ category.name }}</a>{% if not forloop.last %}, {% endif %}</li>
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+    {% if post.tags.exists %}
+        {% for tag in post.tags.all %}
+            <li class="tag_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag blog-tag-{{ tag.count }}">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}</li>
+        {% endfor %}
+    {% endif %}
+</ul>
\ No newline at end of file
diff --git a/djangocms_blog/templates/djangocms_blog/post_detail.html b/djangocms_blog/templates/djangocms_blog/post_detail.html
index f619391..affa872 100644
--- a/djangocms_blog/templates/djangocms_blog/post_detail.html
+++ b/djangocms_blog/templates/djangocms_blog/post_detail.html
@@ -12,28 +12,7 @@
     <header>
         <h2>{% render_model post "title" %}</h2>
 		{% block blog_meta %}
-			<ul class="post-detail">
-				{% if post.author %}
-	            <li>
-	                {% trans "by" %} <a href="{% url 'djangocms_blog:posts-author' post.author.get_username %}">{{ post.author.get_full_name }}</a>
-	            </li>
-				{% endif %}
-	            <li>
-	                {{ post.date_published|date:"M d, Y" }}
-	            </li>
-	        </ul>
-	        <ul class="post-detail tags">
-	            {% if post.categories.exists %}
-	                {% for category in post.categories.all %}
-	                    <li class="category_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-category' category=category.slug %}" class="blog-categories-{{ category.count }}">{{ category.name }}</a>{% if not forloop.last %}, {% endif %}</li>
-	                {% endfor %}
-			    {% endif %}
-	            {% if post.tags.exists %}
-	                {% for tag in post.tags.all %}
-	                    <li class="tag_{{ forloop.counter }}"><a href="{% url 'djangocms_blog:posts-tagged' tag=tag.slug %}" class="blog-tag blog-tag-{{ tag.count }}">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}</li>
-	                {% endfor %}
-			    {% endif %}
-	        </ul>
+			{% include "djangocms_blog/includes/blog_meta.html" %}
 		{% endblock %}
     </header>
     {% if post.main_image_id %}