diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..15d8f359
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Kristian Klette <klette@samfundet.no>
+Johannes Knutsen <johannes@knutseninfo.no> <johannes@iterate.no>
+Johannes Knutsen <johannes@knutseninfo.no> <johannes@barbarmaclin.(none)>
+John Bäckstrand <sopues@gmail.com> <sandos@XBMCLive.(none)>