diff --git a/source/_includes/session-speakers.html.twig b/source/_includes/session-speakers.html.twig
new file mode 100644
index 000000000..67143bb3c
--- /dev/null
+++ b/source/_includes/session-speakers.html.twig
@@ -0,0 +1,11 @@
+<h2>Speakers</h2>
+
+<ul>
+  {% for speaker in speakers if speaker.name in session.speakers %}
+    <li>
+      <a href="{{ speaker.url }}">
+        {{ speaker.name }}
+      </a>
+    </li>
+  {% endfor %}
+</ul>
diff --git a/source/_includes/speaker-session.html.twig b/source/_includes/speaker-session.html.twig
new file mode 100644
index 000000000..fd6dde483
--- /dev/null
+++ b/source/_includes/speaker-session.html.twig
@@ -0,0 +1,7 @@
+<h2>Session</h2>
+
+{% for session in sessions if speaker.name in session.speakers %}
+  <a href="{{ session.url }}">
+    {{ session.title }}
+  </a>
+{% endfor %}
diff --git a/source/_layouts/session.html.twig b/source/_layouts/session.html.twig
index e9ec14eb4..c512ea9d4 100644
--- a/source/_layouts/session.html.twig
+++ b/source/_layouts/session.html.twig
@@ -1,15 +1,8 @@
 {% extends 'page' %}
 
 {% block content_bottom %}
-  <h2>Speakers</h2>
-
-  <ul>
-    {% for speaker in data.speakers if speaker.name in page.speakers %}
-      <li>
-        <a href="{{ speaker.url }}">
-          {{ speaker.name }}
-        </a>
-      </li>
-    {% endfor %}
-  </ul>
+  {% include 'session-speakers' with {
+    session: page,
+    speakers: data.speakers,
+  } %}
 {% endblock %}
diff --git a/source/_layouts/speaker.html.twig b/source/_layouts/speaker.html.twig
index c14514b47..0858e5a0f 100644
--- a/source/_layouts/speaker.html.twig
+++ b/source/_layouts/speaker.html.twig
@@ -39,12 +39,9 @@
 {% endblock %}
 
 {% block content_bottom %}
-    <h3>Session</h3>
-
-    {% for session in data.sessions if page.name in session.speakers %}
-      <a href="{{ session.url }}">
-        {{ session.title }}
-      </a>
-    {% endfor %}
+    {% include 'speaker-session' with {
+      sessions: data.sessions,
+      speaker: page
+    } %}
   </aside>
 {% endblock %}