diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..91ed9b761
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,29 @@
+<benny.malengier@gramps-project.org> <benny.malengier@gmail.com>
+<doug.blank@gmail.com> <dsblank@bitbucket.org>
+<doug.blank@gmail.com> <dblank@cs.brynmawr.edu>
+<beernarrd@gmail.com> <beernarrd@users.sourceforge.net>
+<igal.shapira@gmail.com> <igalshapira@users.sourceforge.net>
+<romjerome@yahoo.fr> <romjerome@users.noreply.github.com>
+<jralls@ceridwen.us> <john@aeolus.local>
+<josip@pisoj.com> <bpisoj@gmail.com>
+Josip Pisoj <josip@pisoj.com>
+Mirko Leonhaeuser <mirko@leonhaeuser.de>
+<martin.hawlisch@gmx.de> <loshawlos@users.sourceforge.net>
+Matti Niemelä <matti.u.niemela@gmail.com>
+<nick-h@gramps-project.org> <nick__hall@hotmail.com>
+<nick-h@gramps-project.org> <Nick-Hall@users.noreply.github.com>
+Ondrej Krč-Jediný <hou@centrum.sk>
+<hou@centrum.sk> <ondrisko@users.sourceforge.com>
+<pf.98052@gmail.com> <pf98052@gmail.com>
+Pierre Bélissent <pierre.belissent@gmail.com>
+Serge Noiraud <Serge.Noiraud@free.fr>
+<Serge.Noiraud@free.fr> <serge.noiraud@free.fr>
+<Serge.Noiraud@free.fr> <serge.noiraud@laposte.net>
+Zdeněk Hataš <zdenek.hatas@gmail.com>
+<zdenek.hatas@gmail.com> <zdenek.hatas@hp.com>
+<zdenek.hatas@gmail.com> <zenhas@users.sourceforge.net>
+<gerald@gkunzmann.de> <g.kunzmann@arcor.de>
+Tim G L Lyons <tim.g.lyons@gmail.com>
+<tim.g.lyons@gmail.com> <guy.linton@gmail.com>
+Elder Evans <elderamevans@gmail.com>
+