diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..94ec5306
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Steve Francia <steve.francia@gmail.com>
+Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
+Fabiano Franz <ffranz@redhat.com>                   <contact@fabianofranz.com>