diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..46c0229
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,10 @@
+<dev@pkanzler.de>                                    <patrick.kanzler@fablab.fau.de>
+<manpaz@gmail.com>                                   <manpaz@bashlinux.com>
+Manuel F Martinez <manpaz@gmail.com>                 manpaz <manpaz@bashlinux.com>
+<emailofdavis@gmail.com>                             <davis.goglin@oregonicecream.com>
+Davis Goglin <emailofdavis@gmail.com>                davisgoglin <emailofdavis@gmail.com>
+Michael Billington <michael.billington@gmail.com>    Michael <michael.billington@gmail.com>
+Cody (Quantified Code Bot) <cody@quantifiedcode.com> Cody <cody@quantifiedcode.com>
+Renato Lorenzi <renato.lorenzi@senior.com.br>        Renato.Lorenzi <renato.lorenzi@senior.com.br>
+Ahmed Tahri <nyuubi.10@gmail.com>                    TAHRI Ahmed <nyuubi.10@gmail.com>
+Michael Elsdörfer <michael@elsdoerfer.com>           Michael Elsdörfer <michael@elsdoerfer.info>