diff --git a/MAINTAINERS b/MAINTAINERS
index 619cc50d8f..8917b3be0f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -40,8 +40,8 @@ Miscellaneous Areas
 ===================
 
 documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
-project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
-project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
+project server day to day operations    (L: root@ffmpeg.org) Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
+project server emergencies              (L: root@ffmpeg.org) Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
 presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
 release management                      Michael Niedermayer
@@ -52,13 +52,13 @@ Communication
 =============
 
 website                                 Deby Barbara Lepage
-fate.ffmpeg.org                         Timothy Gu
+fate.ffmpeg.org                         (L: fate-admin@ffmpeg.org) Timothy Gu
 Trac bug tracker                        Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos
 Patchwork                           [2] Andriy Gelman
 mailing lists                           Baptiste Coudurier
 Twitter                                 Reynaldo H. Verdejo Pinochet
 Launchpad                               Timothy Gu
-ffmpeg-security                     [2] Michael Niedermayer, Reimar Doeffinger
+ffmpeg-security                     [2] (L: ffmpeg-security@ffmpeg.org) Michael Niedermayer, Reimar Doeffinger
 
 
 libavutil