diff --git a/.mailmap b/.mailmap
index 5181b5fe7..e751536b0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,99 @@
-Luke Kanies <luke@puppetlabs.com> <luke@980ebf18-57e1-0310-9a29-db15c13687c0> <luke@madstop.com>
-Jeff McCune <jeff@puppetlabs.com> Jeffrey McCune <mccune.jeff@gmail.com> Jeffrey J McCune <jeff@northstarlabs.net> <jeff.mccune@northstarlabs.net>
+Adrien Thebo <adrien@puppetlabs.com> Adrien Thebo <adrien.thebo@gmail.com>
+Adrien Thebo <adrien@puppetlabs.com> adrienthebo <adrien@puppetlabs.com>
+Allen Ballman <aballman@gmail.com> ballman <ballman@980ebf18-57e1-0310-9a29-db15c13687c0>
+Andrew Shafer <andrew@puppetlabs.com> Andrew Shafer <andrew@luke-kaniess-macbook-pro-15.local>
+Andrew Shafer <andrew@puppetlabs.com> Andrew Shafer <andrew@reductivelabs.com>
+Andrew Shafer <andrew@puppetlabs.com> shafer <shafer@980ebf18-57e1-0310-9a29-db15c13687c0>
+Anselm Strauss <amsibamsi@gmail.com> Anselm Strauss <anselm@beastie.ttyv0.net>
+Anselm Strauss <amsibamsi@gmail.com> Anselm Strauss <anselm@silversurfer.l.ttyv0.net>
+Ben Hengst <notbenh@cpan.org> ben hengst <notbenh@cpan.org>
+Ben Hughes <ben@puppetlabs.com> Ben H <git@mumble.org.uk>
+Ben Hughes <ben@puppetlabs.com> Ben Hughes <git@mumble.org.uk>
+Blake Barnett <blake@soulmachine.net> shadoi <shadoi@980ebf18-57e1-0310-9a29-db15c13687c0>
+Brice Figureau <brice-puppet@daysofwonder.com> Brice Figureau <brice@daysofwonder.com>
+Bryan Kearney <bkearney@redhat.com> Bryan Kearney <bkearney@localhost.localdomain>
+Cameron Thomas <cameron@puppetlabs.com> Cameron Thomas <cs.thomas.dev@gmail.com>
+Carl Caum <carl@puppetlabs.com> Carl Caum <carl@carlcaum.com>
+Chris Price <chris@puppetlabs.com> Chris Price <cprice@explosivo.(none)>
+Chris Price <chris@puppetlabs.com> cprice
+Christian Hofstaedtler <hofstaedtler@inqnet.at> Christian Hofstaedtler <ch+git@zeha.at>
+Dan Bode <dan@puppetlabs.com> Dan Bode <bodepd@gmail.com>
+Dan Bode <dan@puppetlabs.com> Dan Bode <dan@bodepd.com>
+Dan Bode <dan@puppetlabs.com> Dan Bode <dan@reductivelabs.com>
+Daniel Pittman <daniel@puppetlabs.com> Daniel Pittman <daniel@rimspace.net>
+David Lutterkort <lutter@redhat.com> David Lutterkort <dlutter@redhat.com>
+David Lutterkort <lutter@redhat.com> lutter <lutter@1f5c1d6a-bddf-0310-8f58-fc49e503516a>
+David Lutterkort <lutter@redhat.com> lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>
+David Schmitt <david@dasz.at> David Schmitt <david@schmitt.edv-bus.at>
+Deepak Giridharagopal <deepak@puppetlabs.com> Deepak Giridharagopal <deepak@brownman.org>
+Dominic Maraglia <dominic@puppetlabs.com> <dmaraglia@gmail.com>
+Donavan Miller <donavan@desinc.net> donavan <donavan@desinc.net>
+Eric Sorenson <eric.sorenson@puppetlabs.com> Eric Sorenson <ahpook@gmail.com>
+Eric Sorenson <eric.sorenson@puppetlabs.com> Eric Sorenson <eric@explosive.net>
+Eric Sorenson <eric.sorenson@puppetlabs.com> Eric Sorenson <eric@leterel.apple.com>
+Francois Deppierraz <francois@ctrlaltdel.ch> Francois Deppierraz <francois@slayer.ctrlaltdel.ch>
+Garrett Honeycutt <garrett@puppetlabs.com> Garrett Honeycutt <puppet-dev@garretthoneycutt.com>
+Gary Larizza <gary@puppetlabs.com> Gary Larizza <ccshots@gmail.com>
+Greg Sutcliffe <greg.sutcliffe@gmail.com> Greg Sutcliffe <gsutcliffe@gmail.com>
 James Turnbull <james@puppetlabs.com> James Turnbull <james@lovedthanlost.net>
+James Turnbull <james@puppetlabs.com> James Turnbull <james@rhizome-lovedthanlost-net.local>
+James Turnbull <james@puppetlabs.com> James Turnbull <james@ubuntu904.lovedthanlost.net>
+James Turnbull <james@puppetlabs.com> root <root@absinthe.lovedthanlost.net>
+Jeff McCune <jeff@puppetlabs.com> <jeff.mccune@northstarlabs.net>
+Jeff McCune <jeff@puppetlabs.com> Jeffrey J McCune <jeff@northstarlabs.net>
+Jeff McCune <jeff@puppetlabs.com> Jeffrey McCune <mccune.jeff@gmail.com>
+Jeff McCune <jeff@puppetlabs.com> mccune <mccune@1f5c1d6a-bddf-0310-8f58-fc49e503516a>
+Jeff McCune <jeff@puppetlabs.com> mccune <mccune@980ebf18-57e1-0310-9a29-db15c13687c0>
+Jeff Weiss <jeff.weiss@puppetlabs.com> Jeff Weiss <jeff.a.weiss@gmail.com>
+Jesse Wolfe <jesse@puppetlabs.com> Jesse Wolfe <jes5199@gmail.com>
+Jos Boumans <jos@dwim.org> josb <josb@980ebf18-57e1-0310-9a29-db15c13687c0>
+Josh Cooper <josh@puppetlabs.com> Josh Cooper <josh+github@puppetlabs.com>
+Josh Cooper <josh@puppetlabs.com> joshcooper <josh+github@puppetlabs.com>
+Joshua Harlan Lifton <lifton@puppetlabs.com> lifton <lifton@puppetlabs.com>
+Justin Stoller <justin@puppetlabs.com> Justin Stoller <justin.stoller@gmail.com>
+Kelsey Hightower <kelsey@puppetlabs.com> Kelsey Hightower <kelsey.hightower@gmail.com>
+Kelsey Hightower <kelsey@puppetlabs.com> Kelsey Hightower <kelsey.hightower@puppetlabs.com>
+Ken Barber <ken@puppetlabs.com> Ken Barber <ken@bob.sh>
+Luke Kanies <luke@puppetlabs.com> <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
+Luke Kanies <luke@puppetlabs.com> Luke Kaines <luke@puppetlabs.com>
+Luke Kanies <luke@puppetlabs.com> Luke Kanies <luke@madstop.com>
+Luke Kanies <luke@puppetlabs.com> Luke Kanies <luke@reductivelabs.com>
+Luke Kanies <luke@puppetlabs.com> luke <luke@1f5c1d6a-bddf-0310-8f58-fc49e503516a>
+Markus Roberts <markus@puppetlabs.com> Markus Roberts <Markus@reality.com>
+Markus Roberts <markus@puppetlabs.com> Markus Roberts <markus@phage.local>
+Markus Roberts <markus@puppetlabs.com> markus <markus@AVA-351181.(none)>
+Martin Englund <martin@englund.nu> Martin Englund <martin.englund@sun.com>
+Matt Palmer <mpalmer@hezmatt.org> mpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0>
+Matt Robinson <matt@puppetlabs.com> Matt Robinson <mattr@mattrobinson.net>
+Matthaus Owens <matthaus@puppetlabs.com> Matthaus Litteken <matthaus@puppetlabs.com>
+Matthaus Owens <matthaus@puppetlabs.com> Matthaus Litteken <mlitteken@gmail.com>
+Matthaus Owens <matthaus@puppetlabs.com> Matthaus Owens <mlitteken@gmail.com>
+Michael Stahnke <stahnma@puppetlabs.com> stahnma <stahnma@websages.com>
+Moses Mendoza <moses@puppetlabs.com> MosesMendoza <mendoza.moses@gmail.com>
+Nan Liu <nan@puppetlabs.com> Nan Liu <nan.liu@gmail.com>
 Nick Fagerlund <nick.fagerlund@puppetlabs.com> nfagerlund <nick.fagerlund@gmail.com>
+Nick Fagerlund <nick.fagerlund@puppetlabs.com> nfagerlund <nick.fagerlund@puppetlabs.com>
+Nigel Kersten <nigel@puppetlabs.com> Nigel Kersten <nigel@explanatorygap.net>
+Nigel Kersten <nigel@puppetlabs.com> Nigel Kersten <nigelk@google.com>
+Ohad Levy <ohadlevy@gmail.com> Ohad Levy <ohad.levy@infineon.com>
+Patrick Carlisle <patrick@puppetlabs.com> Patrick <patrick@puppetlabs.com>
+Patrick Carlisle <patrick@puppetlabs.com> pcarlisle <patrick@puppetlabs.com>
+Paul Lathrop <plathrop@digg.com> Paul Lathrop <paul@tertiusfamily.net>
+Paul Lathrop <plathrop@digg.com> Paul Lathrop <plathrop@debian.tertiusfamily.net>
+Peter Meier <peter.meier@immerda.ch> duritong <peter.meier@immerda.ch>
+Peter Meier <peter.meier@immerda.ch> mh <duritong@cronopios.org>
+Peter Mørch <peter@morch.com> peter <peter@morch.com>
+Pieter van de Bruggen <pieter@puppetlabs.com> Pieter van de Bruggen <pvande@gmail.com>
+Rahul Gopinath <rahul@puppetlabs.com> rahul <rahul@pe-solaris11-vm.(none)>
+Rahul Gopinath <rahul@puppetlabs.com> rahul <rahul@puppetlabs.com>
+Rahul Gopinath <rahul@puppetlabs.com> rahul <rahul@solaris11-master.(none)>
+Rahul Gopinath <rahul@puppetlabs.com> vrthra <9@vrtra.net>
+Rein Henrichs <rein@puppetlabs.com> Rein Henrichs <reinh@reinh.com>
+Rudy Gevaert <rudy@webworm.org> rgevaert <rudy+github@webworm.org>
+Rudy Gevaert <rudy@webworm.org> rgevaert <rudy.gevaert+github@ugent.be>
+Russ Allbery <rra@stanford.edu> Russ Allbery <rra@debian.org>
+Sean E. Millichamp <sean@bruenor.org> Sean Millichamp <sean.millichamp@secure-24.com>
+Sean E. Millichamp <sean@bruenor.org> Sean Millichamp <sean@bruenor.org>
+Steve McIintosh <stevemac@endpoint.com> steve mcintosh <stevemac@endpoint.com>
+Thom May <thom@joost.com> Thom May <thom@clearairturbulence.org>
+Thom May <thom@joost.com> Thom May <thom@virelais.nyc.joostas.com>