diff --git a/.mailmap b/.mailmap
index 1e368e9d4..4e3545bd8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,8 @@
 <danilo.eu@gmail.com> <danilo.cesar@collabora.co.uk>
 <dirk@hohndel.org> <dhohndel@dhohndel-mac02.jf.intel.com>
 <dirk@hohndel.org> <hohndel@mail.gr8dns.org>
+Dirk Hohndel <dirk@hohndel.org> Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>
+Dirk Hohndel <dirk@hohndel.org> Subsurface <dirk@subsurface-divelog.org>
 <guido.lerch@gmail.com> <glerch@Guidos-MacBook-Air.local>
 <jacco.van.koll@gmail.com> <jko@haringstad.com>
 <jlmulder@xs4all.nl> <jlmulder@planet.nl>
@@ -28,3 +30,13 @@ Willem Ferguson <willemferguson@zoology.up.ac.za>
 <willemferguson@zoology.up.ac.za> <willem@willem-Precision-M4700.(none)>
 <willemferguson@zoology.up.ac.za> <fergusonwillem@gmail.com>
 <jani@apache.org> <jani@libreoffice.org>
+jan Iversen <jani@apache.org> jan iversen <jani@apache.org>
+Gehad Elrobey <gehadelrobey@gmail.com> <gehadelrobey@gmail.com>
+Joseph W. Joshua <joejoshw@gmail.com> <joejoshw@gmail.com>
+Joseph W. Joshua <joejoshw@gmail.com> <joshua@megvel.me.ke>
+Luisa Pires <luisapiresdesign@gmail.com> <luisapiresdesign@gmail.com>
+Pedro Neves <nevesdiver@gmail.com> <nevesdiver@gmail.com>
+Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it> <tiposchi@tiscali.it>
+Benjamin Fogel <nystire@gmail.com> <nystire@gmail.com>
+Guido Lerch <guido.lerch@gmail.com> <guido.lerch@gmail.com>
+Guido Lerch <guido.lerch@gmail.com> <glerch@Guidos-MacBook-Air.local>