diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..16b56047
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Martin Gieseking <martin.gieseking@uos.de> <mgieseki@users.sourceforge.net>