diff --git a/schedule.md b/schedule.md
index c2c4661..9f42762 100644
--- a/schedule.md
+++ b/schedule.md
@@ -41,21 +41,21 @@
 
 ### Monday
 
-| Time  | Session                                                         |
-|-------|-----------------------------------------------------------------|
-|  8:00 | Registration Opens, Breakfast, Expo & Networking                |
-|  9:00 | Welcome introduction                                            |
-|  9:15 | [What's new in Gerrit 2.14.x](sessions/new-in-2.14.md)          |
-| 10:00 | Gerrit at Google: Multi-master, multi-tenant                    |
-| 10:45 | Break, Expo & Networking                                        |
-| 11:30 | PolyGerrit UX: Findings from research/experience on the new GUI |
-| 12:15 | Lunch, Expo & Networking                                        |
-| 14:00 | [Gerrit CI: keep logs forever](sessions/gerrit-ci-forever.md)   |
-| 14:45 | [Beyond Gerrit](sessions/beyond-gerrit.md)                      |
-| 15:30 | Break, Expo & Networking                                        |
-| 16:00 | [What's new in Gerrit 2.15](sessions/new-in-2.15.md)            |
-| 16:45 | [Q&A with the Gerrit Maintainers](sessions/maintainers-qa.md)   |
-| 17:30 | Drinks, Expo & Networking                                       |
+| Time  | Session                                                                      |
+|-------|------------------------------------------------------------------------------|
+|  8:00 | Registration Opens, Breakfast, Expo & Networking                             |
+|  9:00 | Welcome introduction                                                         |
+|  9:15 | [What's new in Gerrit 2.14.x](sessions/new-in-2.14.md)                       |
+| 10:00 | [Gerrit at Google: Multi-master, multi-tenant](sessions/gerrit-at-google.md) |
+| 10:45 | Break, Expo & Networking                                                     |
+| 11:30 | PolyGerrit UX: Findings from research/experience on the new GUI              |
+| 12:15 | Lunch, Expo & Networking                                                     |
+| 14:00 | [Gerrit CI: keep logs forever](sessions/gerrit-ci-forever.md)                |
+| 14:45 | [Beyond Gerrit](sessions/beyond-gerrit.md)                                   |
+| 15:30 | Break, Expo & Networking                                                     |
+| 16:00 | [What's new in Gerrit 2.15](sessions/new-in-2.15.md)                         |
+| 16:45 | [Q&A with the Gerrit Maintainers](sessions/maintainers-qa.md)                |
+| 17:30 | Drinks, Expo & Networking                                                    |
 
 ### Tuesday
 
diff --git a/sessions/gerrit-at-google.md b/sessions/gerrit-at-google.md
new file mode 100644
index 0000000..3252041
--- /dev/null
+++ b/sessions/gerrit-at-google.md
@@ -0,0 +1,24 @@
+# Gerrit at Google: Multi-master, Mutli-tenant
+
+This talk is about hosting Gerrit at Google, gives insights into our
+architecture and provides some metrics on scale. In addition, it presents
+findings from the recent switch of our load-balancing infrastructure and
+highlights pitfalls we encoutered.
+
+## Gerrit at Google
+
+* Multi-master/-tenant setup
+* Replication
+* Housing large projects like Android and Chromium
+* Some metrics on scale
+* Outages and root-causes
+
+## Load-balancing Git/Gerrit Traffic at Google
+
+* Sharding of hosts, projects and repositories across hundreds of serving tasks
+* Optimizing different caches
+* Load-balancing decisions and their impact on latency
+* What garbage collection means for load-balancing and vice-versa
+
+
+*[Patrick Hiesel, Google](../speakers.md#hiesel)*