diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..c075d3bf
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,10 @@
+Berke Viktor <github.bviktor@outlook.com> <berkeviktor@aol.com>
+Berke Viktor <github.bviktor@outlook.com> <bviktor@hexchat.org>
+Berke Viktor <github.bviktor@outlook.com> <bviktor@outlook.com>
+Berke Viktor <github.bviktor@outlook.com> berkeviktor@aol.com
+Patrick Griffis <tingping@tingping.se> TingPing <tingping@fedoraproject.org>
+Patrick Griffis <tingping@tingping.se> TingPing <tingping@tingping.se>
+Patrick Griffis <tingping@tingping.se> TingPing <tngpng@gmail.com>
+Patrick Griffis <tingping@tingping.se> TingPing <TingPing@users.noreply.github.com>
+Arnav Singh <arnavion@gmail.com> Arnavion
+Eustachy Kapusta <Eustachy.kapusta@gmail.com> tomek