diff --git a/source/talks.html b/source/talks.html
index a9027c1a..86190e4f 100644
--- a/source/talks.html
+++ b/source/talks.html
@@ -27,14 +27,21 @@ talks:
     {% set talks = page.talks|reverse %}
 
     {% set found = false %}
+    {% set year = '0' %}
     {% for talk in talks|reverse if talk.date >= now %}
         {% set found = true %}
         {% if loop.first %}
             <h2>Upcoming Talks</h2>
-            <ul>
         {% endif %}
 
-        {% include 'talk-listing-item' %}
+        {% set this_year %}{{ talk.date|date('Y') }}{% endset %}
+        {% if this_year != year %}
+            <h3>{{ this_year }}</h3>
+            {% set year = this_year %}
+        {% endif %}
+        {{ talk.title }}<br>
+
+        <!--{% include 'talk-listing-item' %}-->
     {% endfor %}
     {% if found %}
         </ul>
@@ -42,15 +49,17 @@ talks:
 
     {% set found = false %}
     {% for talk in talks if talk.date < now %}
-        {% set found = true %}
         {% if loop.first %}
             <h2>Previous Talks</h2>
-            <ul>
         {% endif %}
 
-        {% include 'talk-listing-item' %}
+{% set this_year %}{{ talk.date|date('Y') }}{% endset %}
+        {% if this_year != year %}
+            <h3>{{ this_year }}</h3>
+            {% set year = this_year %}
+        {% endif %}
+        {{ talk.title }}<br>
+        
+        <!-- {% include 'talk-listing-item' %} -->
     {% endfor %}
-    {% if found %}
-        </ul>
-    {% endif %}
 {% endblock %}