diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..83184416d46
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,43 @@
+Alison Mitchell <alison.mitchell@mpi-hd.mpg.de> AMWMitchell <alison.mitchell@mpi-hd.mpg.de>
+Alison Mitchell <alison.mitchell@mpi-hd.mpg.de> Alison Mitchell <Alison.Mitchell@mpi-hd.mpg.de>
+Alison Mitchell <alison.mitchell@mpi-hd.mpg.de> Alison Mitchell <amitchell@amitchell-NB.local>
+Alison Mitchell <alison.mitchell@mpi-hd.mpg.de> Alison Mitchell <amitchell@eduroam-4-158.mpi-hd.mpg.de>
+Alison Mitchell <alison.mitchell@mpi-hd.mpg.de> Alison Mitchell <amitchell@wlan-3-83.mpi-hd.mpg.de>
+
+Daniel Nieto <nieto@gae.ucm.es> nieto@talos <nieto@gae.ucm.es>
+Daniel Parsons <dparsons@lfs2.mpi-hd.mpg.de> Dan Parsons <parsonsrd@gmail.com> 
+
+Francesco Visconti <france.visconti@gmail.com> francesco visconti <france.visconti@gmail.com>
+Francesco Visconti <france.visconti@gmail.com> fvisconti <france.visconti@gmail.com>
+
+Gernot Maier <gernot.maier@desy.de> GernotMaier <gernot.maier@desy.de>
+
+Jean Jacquemier <jacquem@lapp.in2p3.fr> Jacquemier <jacquem@lapp.in2p3.fr>
+Jean Jacquemier <jacquem@lapp.in2p3.fr> jacquem <jacquem@lapp.in2p3.fr>
+Jean Jacquemier <jacquem@lapp.in2p3.fr> jacquemier <jacquem@lapp.in2p3.fr>
+
+Justus Zorn <justus.zorn@desy.de> justuszorn <justus.zorn@desy.de>
+
+Kai Brügge <kai.bruegge@tu-dortmund.de> Kai Bruegge <kai.bruegge@tu-dortmund.de>
+
+Karl Kosack <karl.kosack@cea.fr> Karl Kosack <kosack@users.noreply.github.com>
+
+Lab Saha <lab.saha@gmail.com> labsaha <lab.saha@gmail.com>
+
+Lukas Nickel <lukas.nickel@tu-dortmund.de> LukasNickel <lukas.nickel@tu-dortmund.de>
+
+Maximilian Nöthe <maximilian.noethe@tu-dortmund.de> Maximilian Noethe <maximilian.noethe@tu-dortmund.de>
+
+Raquel de los Reyes <reyes@mpi-hd.mpg.de> rdelosreyes <reyes@mpi-hd.mpg.de>
+
+Samuel Timothy Spencer <sojourner92@gmail.com> Samuel Timothy Spencer <31512502+STSpencer@users.noreply.github.com>
+Samuel Timothy Spencer <sojourner92@gmail.com> Samuel Timothy Spencer <31512502+Sojourner92@users.noreply.github.com>
+
+Tino Michael <tino.michael@cea.fr> tino-michael <tino.michael.87@gmail.com>
+
+Thomas Armstrong <thomas.armstrong@physics.ox.ac.uk> thomasarmstrong <thomas.armstrong@physics.ox.ac.uk>
+Thomas Gasparetto <thomas.gasparetto@ts.infn.it> thomas gasparetto <thomas.gasparetto@ts.infn.it>
+
+Tarek Hassan <tarek.hassan@desy.de> tialis <goldstein2034@hotmail.com>
+
+Wrijupan Bhattacharyya <wrijupan.bhattacharyya@desy.de> wrijupan <wrijupan.bhattacharyya@desy.de>