diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..30fe2218
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,18 @@
+Code <gregoire.duvauchelle@utbm.fr>
+Cyl <labetowiez@aol.fr>
+Juste <maaxleblanc@gmail.com>
+Krophil <pierre.brunet@krophil.fr>
+Lo-J <renaudg779@gmail.com>
+Nabos <gnikwo@hotmail.com>
+Och <francescowitz68@gmail.com>
+Partoo <joqaste@gmail.com>
+Skia <skia@hya.sk> <lordbanana25@mailoo.org>
+Skia <skia@hya.sk> <skia@libskia.so>
+Sli <klmp200@klmp200.net>
+Soldat <ryan-68@live.fr>
+Terre <jbaptiste.lenglet+git@gmail.com>
+Vial <robin.trioux@utbm.fr>
+Zar <antoine.charmeau@utbm.fr> <antoine.charmeau@laposte.net>
+root <root@localhost.localdomain>
+tleb <tleb@openmailbox.org> <theo.lebrun@live.fr>
+tleb <tleb@openmailbox.org> <theo.lebrun@utbm.fr>