diff --git a/i2p2www/blog/helpers.py b/i2p2www/blog/helpers.py
index 2c92bcbe..f714b9d4 100644
--- a/i2p2www/blog/helpers.py
+++ b/i2p2www/blog/helpers.py
@@ -11,7 +11,7 @@ from i2p2www import BLOG_DIR
 SUPPORTED_METATAGS = {
     'author': u'I2P devs',
     'category': None,
-    'date': u'1970-01-01',
+    'date': None,
     'excerpt': u'',
     }
 
@@ -20,11 +20,11 @@ SUPPORTED_METATAGS = {
 # Blog helper methods
 
 def get_blog_feed_items(num=0):
-    posts = get_blog_posts(num)
+    posts = get_blog_posts(num, True)
     items = []
     for post in posts:
-        meta = post[3]
-        parts = post[4]
+        meta = post[1]
+        parts = post[2]
         a = {}
         a['title'] = parts['title']
         a['content'] = meta['excerpt'] if len(meta['excerpt']) > 0 else parts['fragment']
@@ -33,7 +33,7 @@ def get_blog_feed_items(num=0):
         items.append(a)
     return items
 
-def get_blog_posts(num=0):
+def get_blog_posts(num=0, return_parts=False):
     """
     Returns the latest #num valid posts sorted by date, or all slugs if num=0.
     """
@@ -43,10 +43,13 @@ def get_blog_posts(num=0):
         parts = render_blog_post(slug)
         if parts:
             meta = get_metadata_from_meta(parts['meta'])
-            date = get_date_from_slug(slug)
+            meta['date'] = meta['date'] if meta['date'] else get_date_from_slug(slug)
             titlepart = slug.rsplit('/', 1)[1]
-            title = ' '.join(titlepart.split('_'))
-            posts.append((slug, date, title, meta, parts))
+            meta['title'] = ' '.join(titlepart.split('_'))
+            if return_parts:
+                posts.append((slug, meta, parts))
+            else:
+                posts.append((slug, meta))
     return posts
 
 def get_blog_slugs(num=0):
diff --git a/i2p2www/blog/views.py b/i2p2www/blog/views.py
index da04ee22..945a8871 100644
--- a/i2p2www/blog/views.py
+++ b/i2p2www/blog/views.py
@@ -2,7 +2,7 @@ from flask import abort, render_template, request
 from werkzeug.contrib.atom import AtomFeed
 
 from i2p2www import BLOG_POSTS_PER_PAGE
-from i2p2www.blog.helpers import get_blog_posts, get_blog_feed_items, get_metadata_from_meta, render_blog_post
+from i2p2www.blog.helpers import get_blog_posts, get_blog_feed_items, get_date_from_slug, get_metadata_from_meta, render_blog_post
 from i2p2www.helpers import Pagination, get_for_page
 
 
@@ -23,6 +23,7 @@ def blog_post(slug):
 
     if parts:
         meta = get_metadata_from_meta(parts['meta'])
+        meta['date'] = meta['date'] if meta['date'] else get_date_from_slug(slug)
         # now just pass to simple template file and we are done
         return render_template('blog/post.html', parts=parts, title=parts['title'], body=parts['fragment'], slug=slug, meta=meta)
     else:
diff --git a/i2p2www/pages/blog/index.html b/i2p2www/pages/blog/index.html
index 33132183..0a9d37e4 100644
--- a/i2p2www/pages/blog/index.html
+++ b/i2p2www/pages/blog/index.html
@@ -6,19 +6,19 @@
 {% block content %}
 <p>Some descriptive text.</p>
 <ul id="posts">
-{% for post in posts %}
+{% for (slug, post) in posts %}
   <li>
     <article>
       <header>
-        <a href="{{ url_for('blog_post', slug=post[0]) }}">{{ post[2] }}</a>
+        <a href="{{ url_for('blog_post', slug=slug) }}">{{ post.title }}</a>
       </header>
-      {%- if post[3].excerpt %}
-      <p>{{ post[3].excerpt }}</p>
+      {%- if post.excerpt %}
+      <p>{{ post.excerpt }}</p>
       {%- endif %}
       <footer>
         <ul>
-          <li>{{ post[1] }}</li>
-          <li>{{ post[3].author }}</li>
+          <li>{{ post.date }}</li>
+          <li>{{ post.author }}</li>
         </ul>
       </footer>
     </article>
diff --git a/i2p2www/pages/blog/latest.html b/i2p2www/pages/blog/latest.html
index 436ad209..a6c2b72f 100644
--- a/i2p2www/pages/blog/latest.html
+++ b/i2p2www/pages/blog/latest.html
@@ -1,6 +1,6 @@
       <ul>
-      {% for post in blog_posts -%}
-        <li>{{ post[1] }} - <a href="{{ url_for('blog_post', slug=post[0]) }}">{{ post[2] }}</a></li>
+      {% for slug, post in blog_posts -%}
+        <li>{{ post.date }} - <a href="{{ url_for('blog_post', slug=slug) }}">{{ post.title }}</a></li>
       {%- endfor %}
         <li><a href="{{ url_for('blog_index', lang=g.lang) }}"><em>More blog posts&hellip;</em></a></li>
       </ul>