diff --git a/.mailmap b/.mailmap
index fb44eb826..a8b171908 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,3 +3,5 @@ Vicent Martí <vicent@github.com> Vicent Martí <tanoku@gmail.com>
 Michael Schubert <schu@schu.io> schu <schu-github@schulog.org>
 Ben Straub <bs@github.com> Ben Straub <ben@straubnet.net>
 Ben Straub <bs@github.com> Ben Straub <bstraub@github.com>
+Carlos Martín Nieto <cmn@dwim.me> <carlos@cmartin.tk>
+Carlos Martín Nieto <cmn@dwim.me> <cmn@elego.de>