diff --git a/sessions/beyond-gerrit.md b/sessions/beyond-gerrit.md
index 55b7bb2..6cbcd0a 100644
--- a/sessions/beyond-gerrit.md
+++ b/sessions/beyond-gerrit.md
@@ -7,7 +7,4 @@
 under a single TeamForge umbrella and what are the immediate
 benefits of it.
 
-*Jacek Centkowski, CollabNet*
-
-Jacek is a contributor to Gerrit since 2013 but mostly works on
-TeamForge Git/Gerrit Integration for CollabNet's team in Berlin.
+*[Jacek Centkowski, CollabNet](../speakers.md#jcentkowski)*
diff --git a/sessions/gerrit-scripting-plugins.md b/sessions/gerrit-scripting-plugins.md
index 3907fdb..65595d6 100644
--- a/sessions/gerrit-scripting-plugins.md
+++ b/sessions/gerrit-scripting-plugins.md
@@ -19,9 +19,4 @@
 - Groovy
 - Scala
 
-*Luca Milanesio / GerritForge*
-
-Gerrit Contributor for over five years, my first commit
-was cf5cd23d (the PluginLoader), maintainer of
-GerritHub.io, the Open Service for Gerrit Code Review
-on top of GitHub repositories.
+*[Luca Milanesio / GerritForge](../speakers.md#lmilanesio)*
diff --git a/sessions/maintainers-qa.md b/sessions/maintainers-qa.md
index 0728f7a..296ccf4 100644
--- a/sessions/maintainers-qa.md
+++ b/sessions/maintainers-qa.md
@@ -3,10 +3,10 @@
 Meet the Gerrit maintainers and ask those questions that
 you've always been wanting to ask.
 
-*Alice Kober-Sotzek, Google*
-*Becky Siegel, Google*
-*Dave Borowitz, Google*
-*David Pursehouse, CollabNet*
-*Edwin Kempin, Google*
-*Wyatt Allen, Google*
-*other maintainers TBC*
+* *[Alice Kober-Sotzek, Google](../speakers.md#aliceks)*
+* *[Becky Siegel, Google](../speakers.md#beckysiegel)*
+* *[Dave Borowitz, Google](../speakers.md#dborowitz)*
+* *[David Pursehouse, CollabNet](../speakers.md#dpursehouse)*
+* *[Edwin Kempin, Google](../speakers.md#ekempin)*
+* *[Wyatt Allen, Google](../speakers.md#wyattallen)*
+* *other maintainers TBC*
diff --git a/sessions/mining_gerrit.md b/sessions/mining_gerrit.md
index b5c9b66..cab0d13 100644
--- a/sessions/mining_gerrit.md
+++ b/sessions/mining_gerrit.md
@@ -11,14 +11,4 @@
 patch. The second study follows how the concerns that reviewers raise evolve as
 the OpenStack community ages and individual reviews accrue experience.
 
-*Shane McIntosh, McGill University*
-
-Shane McIntosh is an assistant professor in the Department of Electrical and
-Computer Engineering at McGill University, where he leads the Software
-Repository Excavation and Build Engineering Labs (Software REBELs). He received
-his Bachelor's degree in Applied Computing from the University of Guelph and
-his MSc and PhD in Computer Science from Queen's University, for which he was
-awarded the Governor General of Canada's Academic Gold Medal. In his research,
-Shane uses empirical software engineering techniques to study software build
-systems, release engineering, and software quality. More info about Shane and
-the REBELs is available [online](http://rebels.ece.mcgill.ca/).
+*[Shane McIntosh, McGill University](../speakers.md#smcintosh)*
diff --git a/sessions/new-in-2.14.md b/sessions/new-in-2.14.md
index 6b475af..a00a0b7 100644
--- a/sessions/new-in-2.14.md
+++ b/sessions/new-in-2.14.md
@@ -3,9 +3,5 @@
 Overview of the new features included in the latest release
 of Gerrit.
 
-*David Pursehouse, CollabNet*
-
-David is a contributor to Gerrit since 2011 and a maintainer/committer
-since 2012. He is based in Japan and works remotely as part of
-CollabNet's Teamforge Git Engineering team in Berlin.
+*[David Pursehouse, CollabNet](../speakers.md#dpursehouse)*
 
diff --git a/sessions/new-in-2.15.md b/sessions/new-in-2.15.md
index f82cc03..d2f9c21 100644
--- a/sessions/new-in-2.15.md
+++ b/sessions/new-in-2.15.md
@@ -2,4 +2,4 @@
 
 Preview of the new features coming in the next release of Gerrit.
 
-*Dave Borowitz, Google*
+*[Dave Borowitz, Google](../speakers.md#dborowitz)*
diff --git a/sessions/template.md b/sessions/template.md
index 1b2f0f6..396ae65 100644
--- a/sessions/template.md
+++ b/sessions/template.md
@@ -11,7 +11,4 @@
 tristique elementum. Phasellus fringilla, turpis nec posuere
 feugiat, risus mi lobortis dolor, at consectetur orci dolor ut nunc.
 
-*First Last Name, Affiliation / Company*
-
-Short bio about yourself (max 100 words).
-
+*[First Last Name, Affiliation / Company](../speakers.md#anchor)*