diff --git a/.mailmap b/.mailmap
index 958cdcabd3a..dc6bf01a5b1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,8 +22,9 @@ Hibernate-CI <ci@hibernate.org> <jenkins@ip-172-30-1-106.ec2.internal>
 Mincong HUANG <mincong.h@gmail.com>
 rnveach <rveach02@gmail.com>
 rnveach <rveach02@gmail.com> <ricky@ricky-VirtualBox>
-Sanne Grinovero <sanne.grinovero@gmail.com>
 Sanne Grinovero <sanne@hibernate.org>
+Sanne Grinovero <sanne@hibernate.org> <sanne.grinovero@gmail.com>
 Waldemar Kłaczyński <wklaczynski@sabaservice.pl>
-Waldemar Kłaczyński <waldek@azzumi.pl>
+Waldemar Kłaczyński <wklaczynski@sabaservice.pl> <waldek@azzumi.pl>
+Yoann Rodière <yoann@hibernate.org>
 Yoann Rodière <yoann@hibernate.org> <yrodiere@redhat.com>
\ No newline at end of file