diff --git a/templates/index.html b/templates/index.html
index eb7568e36d01e5c91748bb165a5f40c2b7ff4750..215be3e8de3d9d610988ba2b31283e29e6a29659 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -6,10 +6,10 @@
             <ul>
                 {% for article in articles_page.object_list %}
                 <li>
-		  {% if article.date >= article.date.utcnow() %}
+		  {% if article.date.isocalendar() >= article.date.today().isocalendar() %}
 		  <h1><time datetime="{{ article.date }}">{{ article.date|strftime('%b %d, %Y') }}</time></h1>
                         <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-                               title="Permalink to {{ article.title|striptags }}">{{ article.title }}
+                               title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
       {% if article.author %}
       <h3>{{ article.author }}</h3>
       {% endif %}