diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..5c60b03d28b
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,35 @@
+Michael DeHaan <michael.dehaan@gmail.com> <michael@ansibleworks.com>
+Michael DeHaan <michael.dehaan@gmail.com> Michael DeHaan <Michael DeHaan michael@ansibleworks.com>
+Michael DeHaan <michael.dehaan@gmail.com> <michael@ansible.com>
+<bcoca@ansible.com> <brian.coca+git@gmail.com>
+<bcoca@ansible.com> <briancoca+ansible@gmail.com>
+<bcoca@ansible.com> <briancoca+dev@gmail.com>
+<bcoca@ansible.com> <bcoca@tablethotels.com>
+<a.badger@gmail.com> <toshio@fedoraproject.org>
+James Tanner <tanner.jc@gmail.com>
+<jimi@sngx.net> <jcammarata@ansibleworks.com>
+Michael Scherer <misc@zarb.org> mscherer <misc@zarb.org>
+<misc@zarb.org> <misc@ephaone.org>
+<misc@zarb.org> <mscherer@users.noreply.github.com>
+James Martin <jmartin@ansible.com> <jmartin@basho.com>
+James Laska <jlaska@ansible.com> <jlaska@redhat.com>
+James Laska <jlaska@ansible.com> <jlaska@ansibleworks.com>
+James Laska <jlaska@ansible.com> <jlaska@James-Laskas-MacBook-Pro.local>
+James Laska <jlaska@ansible.com> <jlaska@users.noreply.github.com>
+Jason McKerr <mckerrj@gmail.com> <jmckerr@jmckerr-OSX.local>
+Chris Houseknecht <chouseknecht@ansible.com>
+Chris Houseknecht <chouseknecht@ansible.com> chouseknecht <chouse@ansible.com>
+Chris Houseknecht <chouseknecht@ansible.com> Chris Houseknecht <chouse@ansibleworks.com>
+Stephen Fromm <sfromm@gmail.com> Stephen Fromm <stephenf@nero.net>
+Sandra Wills <docschick@ansible.com> Sandra Wills <swills@ansible.com>
+Will Thames <will@thames.id.au> willthames <will@thames.id.au>
+Will Thames <will@thames.id.au> Will Thames <willdthames@gmail.com>
+Will Thames <will@thames.id.au> willthames <willdthames@gmail.com>
+Will Thames <will@thames.id.au> willthames <will@musc.org.uk>
+Will Thames <will@thames.id.au> u348095 <will.thames@suncorp.com.au>
+Will Thames <will@thames.id.au> willthames <will.thames@suncorp.com.au>
+nitzmahone <mdavis@ansible.com> Matt Davis <nitzmahone@users.noreply.github.com>
+Dag Wieers <dag@wieers.com> Dag Wieërs <dag@wieers.com>
+Dag Wieers <dag@wieers.com> Dag Wieers <dag.wieers@gmail.com>
+
+