diff --git a/schedule.md b/schedule.md
index 5e81dbc..cee6229 100644
--- a/schedule.md
+++ b/schedule.md
@@ -52,13 +52,13 @@
 |  9:30 | Welcome introduction
 |  9:45 | [What's new in Gerrit 3.6 and 3.7](sessions/whats-new-gerrit-3.6-3.7.md)
 | 10:30 | [Wrestling large repos with JGit an Gerrit](sessions/wrestling-large-repos.md)
-| 11:15 | __Talk available__
+| 11:15 | [Q&A with the Gerrit Maintainers](sessions/maintainers-qa.md)
 | 12:00 | Lunch & Networking
 | 14:00 | [Gerrit for smoothly switching from SVN to Git](sessions/svn-to-git.md)
 | 14:45 | __Talk available__
 | 15:30 | Break & Networking
 | 16:00 | [Using Gerrit with Zuul](sessions/gerrit-and-zuul.md)
-| 16:45 | [Q&A with the Gerrit Maintainers](sessions/maintainers-qa.md)
+| 16:45 | __Talk available__
 | 17:30 | Party and free drinks
 
 ### Friday, 11th of November
diff --git a/sessions/maintainers-qa.md b/sessions/maintainers-qa.md
index d8dfa4a..8e9c034 100644
--- a/sessions/maintainers-qa.md
+++ b/sessions/maintainers-qa.md
@@ -4,4 +4,4 @@
 you've always been wanting to ask.
 
 * *[Luca Milanesio, GerritForge](../speakers.md#lmilanesio)*
-* *other maintainers TBC*
+* *[Edwin Kempin, Google](../speakers.md#ekempin)*
diff --git a/speakers.md b/speakers.md
index 8b20b23..9294921 100644
--- a/speakers.md
+++ b/speakers.md
@@ -98,3 +98,13 @@
 
 Over the last months he has been involved in the design and development of
 the Bearer Token Authentication in pull-replication.
+
+### Edwin Kempin - Google {#ekempin}
+
+Edwin is a long-time Gerrit contributor. He joined the Gerrit project in 2010,
+became a maintainer in 2012 and assumed the role as community manager in 2019.
+
+Since 2015 he's working at Google in the Gerrit backend team that develops Gerrit
+core and maintains the Gerrit infrastructure at Google.
+Previously Edwin worked 10+ years at SAP where he was responsible for Gerrit
+development and hosting as well.