diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..8e9d00f1e1
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+Andrea Maria Piana <cammellos@cammelloss-MacBook-Pro.local>
+Aleksandr Pantyukhov <alwxndr@gmail.com>
+Aleksandr Pantyukhov <me@alwx.me>
+Anton Danchenko <adan@ciklum.com>
+Chad Jackson <chad@status.im>
+Dmitry Shulyak <yashulyak@gmail.com>
+Erik Dvorsak <yenda1@gmail.com> 
+Erik Dvorsak <eric@dvorsak.fr>
+Erik Dvorsak <eric@status.im>
+George Lipov <gnl@lipov.net>
+Goran Jović <goranjovic@gmail.com>
+Jan Herich <jan.herich@gmail.com>
+Jan Herich <ot73589@OT73589M1.local>
+Jakub Sokołowski <i+github@always.fail>
+Jarrad Hope <jarrad@Jarrads-iMac.local>
+Oskar Thorén <ot@oskarthoren.com>