diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..5c8ed2e8b5a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,29 @@
+# git mailmap (see git-shortlog(1))
+# format: New Name <new@address> Old Name <old@address>
+
+Andrea Brancaleoni <abc@pompel.me> Andrea Brancaleoni <andrea.brancaleoni@cleafy.com>
+Andrea Brancaleoni <abc@pompel.me> Andrea Brancaleoni <miwaxe@gmail.com>
+Andrea Brancaleoni <abc@pompel.me> Andrea Brancaleoni <virus@gmx.us>
+Dominik Honnef <dominik@honnef.co> Dominik Honnef <dominikh@fork-bomb.org>
+Duncaen <duncaen@voidlinux.eu> Duncaen <mail@duncano.de>
+Duncaen <duncaen@voidlinux.eu> Duncan Overbruck <administrator@duncano.de>
+Duncaen <duncaen@voidlinux.eu> Duncan Overbruck <mail@duncano.de>
+Enno Boland <gottox@voidlinux.eu> Enno Boland <eb@s01.de>
+Enno Boland <gottox@voidlinux.eu> Enno Boland <g@s01.de>
+Enno Boland <gottox@voidlinux.eu> Gottox <g@s01.de>
+Jan S <jan.schreib@gmail.com> jan-schreib <jan.schreib@gmail.com>
+John Regan <john@jrjrtech.com> John Regan <jregan@mesonet.org>
+Juan RP <xtraeme@voidlinux.eu> Juan RP <xtraeme@gmail.com>
+Jürgen Buchmüller <pullmoll@t-online.de> Juergen Buchmueller <pullmoll@t-online.de>
+Logen Kain <logen@sudotask.com> Logen Kain <walach.of.harkon@gmail.com>
+Philipp Hirsch <itself@hanspolo.net> hanspolo <ph.hanspolo@googlemail.com>
+Stefan Mühlinghaus <jazzman@alphabreed.com> Stefan Mühlinghaus <muehlinghaus@mmh.ag>
+bougyman <bougyman@voidlinux.eu> bougyman <bougyman@rubyists.com>
+bougyman <bougyman@voidlinux.eu> bougyman <bougyman@users.noreply.github.com>
+bougyman <bougyman@voidlinux.eu> bougyman <tj@rubyists.com>
+chrome-pepper-bot <eb@s01.de> Enno Boland (bot) <g@s01.de>
+onekk <carlo.dormeletti@email.it> onekk <carlo.dormeletti@alice.it>
+pancake <pancake@nopcode.org> pancake <pancake@flubox.(none)>
+pancake <pancake@nopcode.org> radare <pancake@nopcode.org>
+xdave <davehome@redthumb.info.tm> davehome <davehome@redthumb.info.tm>
+yopito <pierre.bourgin@free.fr> yopito <yopito@users.noreply.github.com>