diff --git a/.mailmap b/.mailmap
index ddcf1a7a..cf26f1df 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,3 +16,4 @@ James Zern <jzern@google.com>
 Roberto Alanis <alanisbaez@google.com>
 Brian Ledger <brianpl@google.com>
 Maryla Ustarroz-Calonge <maryla@google.com>
+Yannis Guyon <yguyon@google.com>