diff --git a/source/_includes/talk-list-item.html.twig b/source/_includes/talk-list-item.html.twig
new file mode 100644
index 00000000..cfbe872a
--- /dev/null
+++ b/source/_includes/talk-list-item.html.twig
@@ -0,0 +1,6 @@
+<li>
+    {{ talk.event.name }} -
+    <a href="{{ talk.url }}">
+        {{ talk.title }}
+    </a>
+</li>
diff --git a/source/_includes/talk-list.html.twig b/source/_includes/talk-list.html.twig
new file mode 100644
index 00000000..c1ba5465
--- /dev/null
+++ b/source/_includes/talk-list.html.twig
@@ -0,0 +1,5 @@
+<ul>
+    {% for talk in talks if talk.type == type %}
+        {{ include('talk-list-item') }}
+    {% endfor %}
+</ul>
diff --git a/source/_includes/talk-listing-item.html.twig b/source/_includes/talk-listing-item.html.twig
deleted file mode 100644
index e0301387..00000000
--- a/source/_includes/talk-listing-item.html.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-{{ talk.event.name }} -
-{% if talk.fuzzy_date %}
-    {{ talk.title }}
-{% else %}
-    <a href="{{ talk.url }}">{{ talk.title }}</a>
-{% endif %}
diff --git a/source/talks.html.twig b/source/talks.html.twig
new file mode 100644
index 00000000..be773fa1
--- /dev/null
+++ b/source/talks.html.twig
@@ -0,0 +1,20 @@
+---
+layout: page
+nav: talks
+title: Talks
+meta:
+    description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
+use:
+    - talks
+---
+<p>I regularly speak at conferences and user groups about a range of subjects including Drupal, Sculpin and Git. If you would like to me to speak at your group or conference, please <a href="mailto:{{ site.email }}?subject=Speaking%20enquiry">get in touch</a>.</p>
+<p>There is also information about events that I’ve attended and spoken at on my <a href="{{ site.lanyrd.url }}">Lanyrd</a> and <a href="{{ site.joindin.url }}">Joind.in</a> profiles.</p>
+
+<h2>Conferences</h2>
+
+{{ include('talk-list', { talks: data.talks, type: 'conference' }) }}
+
+<h2>User groups</h2>
+
+{{ include('talk-list', { talks: data.talks, type: 'meetup' }) }}
+
diff --git a/source/talks.md b/source/talks.md
deleted file mode 100644
index 52a362ce..00000000
--- a/source/talks.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-layout: default
-nav: talks
-title: Talks
-meta:
-    description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
-use:
-    - talks
----
-# Talks
-
-I regularly speak at conferences and user groups about a range of subjects including Drupal, Sculpin and Git. If you would like to me to speak at your group or conference, please <a href="mailto:{{ site.email }}?subject=Speaking%20enquiry">get in touch</a>.
-
-There is also information about events that I’ve attended and spoken at on my <a href="{{ site.lanyrd.url }}">Lanyrd</a> and <a href="{{ site.joindin.url }}">Joind.in</a> profiles.
-
-{{ include('upcoming-talks') }}
-{{ include('previous-talks') }}