diff --git a/.gitignore b/.gitignore
index f3bdc52cada..e60aeddcacb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ build-aux
 *.diff
 !.gitignore
 .*
+!.mailmap
 
 # ./configure
 
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..31f59e1834e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,13 @@
+Benoit Chesneau <benoitc@apache.org> <bchesneau@gmail.com>
+Benoit Chesneau <benoitc@apache.org> benoitc <benoitc@apache.org>
+
+Jason Smith <jhs@apache.org> Jason Smith (air) <jhs@iriscouch.com>
+Jason Smith <jhs@apache.org> Jason Smith (air) <jhs@apache.org>
+
+Filipe David Borba Manana <fdmanana@apache.org>
+
+Randall Leeds <randall@apache.org> <randall.leeds@gmail.com>
+
+Paul Joseph Davis <davisp@apache.org> Paul J. Davis <davisp@apache.org>
+
+Bob Dionne <bitdiddle@apache.org> bitdiddle <bitdiddle@apache.org>
\ No newline at end of file