diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..e93adabc
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+spf13 <steve.francia@gmail.com> Steve Francia <steve.francia@gmail.com>
+bep <bjorn.erik.pedersen@gmail.com> Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
+