diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..af6538ec1
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,23 @@
+Edgar Luque <git@edgarluque.com> Edgar <git@edgarluque.com>
+Edgar Luque <git@edgarluque.com> Ryozuki <edgar@ryobyte.com>
+Edgar Luque <git@edgarluque.com> Ryozuki <clud6565@gmail.com>
+Edgar Luque <git@edgarluque.com> Edgar <edgar@ryobyte.com>
+Edgar Luque <git@edgarluque.com> Edgar Luque <clud6565@gmail.com>
+Edgar Luque <git@edgarluque.com> Ryozuki <ryo@ryozuki.xyz>
+Edgar Luque <git@edgarluque.com> Edgar <ryo@ryozuki.xyz>
+heinrich5991 <heinrich5991@gmail.com> heinrich5991 <heinrich5991@gmx.de>
+Jupeyy <jupjopjap@gmail.com> jupeyy <jupjopjap@gmail.com>
+Jupeyy <jupjopjap@gmail.com> jupeyy <jupeyy@jupeyy>
+Jupeyy <jupjopjap@gmail.com> jupeyy <jupeyy@am-6036ddb5ef41.intern>
+Learath2 <learath2@gmail.com> Learath <learath2@gmail.com>
+Learath2 <learath2@gmail.com> Learath Lea <learath2@gmail.com>
+Learath2 <learath2@gmail.com> Learath2 <emir1998@gmail.com>
+Learath2 <learath2@gmail.com> Emir Marincic <learath2@gmail.com>
+ChillerDragon <ChillerDragon@gmail.com> ChillerDragon <chillerdragon@gmail.com>
+ChillerDragon <ChillerDragon@gmail.com> ChillerDrgon <ChillerDragon@gmail.com>
+ChillerDragon <ChillerDragon@gmail.com> Chiller Dragon <chillerdragon@gmail.com>
+ChillerDragon <ChillerDragon@gmail.com> Chiller Dragun <ChillerDragon@gmail.com>
+Dennis Felsing <dennis@felsin9.de> def <dennis@felsin9.de>
+Dennis Felsing <dennis@felsin9.de> Dennis Felsing <dennis.felsing@sap.com>
+Patiga <dev@patiga.eu> patiga <patigatus21@gmail.com>
+Patiga <dev@patiga.eu> patiga <dev@patiga.eu>