diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..4f3840d30e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,15 @@
+Adrian Cole <adrian.f.cole@3d8758e0-26b5-11de-8745-db77d3ebf521>
+Adrian Cole <acole@.eng.vmware.com>
+Alfredo Morresi <rainbowbreeze@gmx.com>
+Alfredo Morresi <rainbowbreeze@pc-alfredo.(none)>
+Andrea Turli <andrea@bigmac.local>
+Andrea Turli <andrea.turli@.dir.svc.accenture.com>
+Andrea Turli <Andrea_Turli@.dub.emea.dell.com>
+Andrea Turli <andrea.turli@gmail.com>
+Andrea Turli <toor@toor.(none)>
+Andrei Savu <asavu@apache.org>
+Antoni Batchelli <tbatchelli@acm.org>
+Ivan Meredith <ivan@ivan.net.nz@3d8758e0-26b5-11de-8745-db77d3ebf521>
+Seshu Pasam <github@pasam.com>
+Tibor Kiss <tibor.kiss@omixon.com>
+Vijay Kiran <mail@vijaykiran.com>