diff --git a/.mailmap b/.mailmap
index 0d8394717..6991114f6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -30,6 +30,7 @@ Alexander A. Klimov <alexander.klimov@icinga.com> <alexander.klimov@icinga.com>
 <tobias.vonderkrone@profitbricks.com> <tobias@vonderkrone.info>
 <yonas.habteab@icinga.com> <yonas.habteab@netways.de>
 Alex <alexp710@hotmail.com> <alexp710@hotmail.com>
+Baptiste Beauplat <lyknode@cilg.org> <lyknode@cilg.org>
 Carsten Köbke <carsten.koebke@gmx.de> Carsten Koebke <carsten.koebke@koebbes.de>
 Claudio Kuenzler <ck@claudiokuenzler.com>
 Diana Flach <diana.flach@icinga.com> <crunsher@bamberg.ccc.de>