diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..c867f855
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+no_author <bounces@inl.gov>
+Cody Permann <codypermann@gmail.com>
+Cody Permann <cody.permann@inl.gov>
+Andrew Slaughter <andrew.slaughter@inl.gov>
+Yidong Xia <yidong.xia@inl.gov>
+John W. Peterson <jwpeterson@gmail.com>
+John W. Peterson <jw.peterson@inl.gov>