diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..af8eb2f941
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Rick Elrod <relrod@redhat.com> <codeblock@fedoraproject.org>
+Rick Elrod <relrod@redhat.com> Ricky Elrod
+Rick Elrod <relrod@redhat.com> Ricky Elrod <codeblock@lockbox01.phx2.fedoraproject.org>
+
+# ... others go here ...