diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..6c1ec786b6b08a813df652ffbd2ed3b637f966cb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,11 @@
+Gottfried Gaisbauer <gogo@servus.at> Gottfried <gogo@servus.at>
+Ingo Leindecker <ingo.leindecker@fro.at> ingo <ingo.leindecker@fro.at>
+David Trattnig <david.trattnig@gmail.com> <david@subsquare.at>
+David Trattnig <david.trattnig@gmail.com> <david.trattnig@o94.at>
+David Trattnig <david.trattnig@gmail.com> david
+Christian Pointner <equinox@helsinki.at> Christian Pointner <equinox@spreadspace.org>
+Ernesto Rico Schmidt <ernesto@helsinki.at> Ernesto Rico Schmidt <e.rico.schmidt@gmail.com>
+Ernesto Rico Schmidt <ernesto@helsinki.at> nnrcschmdt <e.rico.schmidt@gmail.com>
+Hermann Schwärzler <hermann.schwaerzler@freirad.at> Hermann <hermann@laptop>
+jackie / Andrea Ida Malkah Klaura <jackie@diebin.at> <jackie@o94.at>
+jackie / Andrea Ida Malkah Klaura <jackie@diebin.at> Andrea Ida Malkah Klaura
\ No newline at end of file