diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..fb46eeb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Craig Lamparter <craig@craiger.org> <craiger@hpe.com>
+Craig Lamparter <craig@craiger.org> craigerl <craig@craiger.org>
+Craig Lamparter <craig@craiger.org> craigerl <craiger@hpe.com>
+Walter A. Boring IV <waboring@hemna.com> Hemna <waboring@hemna.com>