diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..5181b5fe7
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+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>
+James Turnbull <james@puppetlabs.com> James Turnbull <james@lovedthanlost.net>
+Nick Fagerlund <nick.fagerlund@puppetlabs.com> nfagerlund <nick.fagerlund@gmail.com>