diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..4abeb1e8a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,9 @@
+Jeremy Stretch <jstretch@ns1.com> <jeremy@netverity.dev>
+Jeremy Stretch <jstretch@ns1.com> <stretch@packetlife.net>
+Jeremy Stretch <jstretch@ns1.com> <jeremy.stretch@networktocode.com>
+Jeremy Stretch <jstretch@ns1.com> <jstretch@digitalocean.com>
+Jeremy Stretch <jstretch@ns1.com>
+Jonathan Senecal <contact@jonathansenecal.com> <xxinfinityxx@gmail.com>
+Jonathan Senecal <contact@jonathansenecal.com> <jsenecal@users.noreply.github.com>
+Jonathan Senecal <contact@jonathansenecal.com>
+Daniel Sheppard <dans@dansheps.com>