diff --git a/.mailmap b/.mailmap
index 11a44f579e6f8b13817a77fc80bc220e4fc5c777..5d29ff03d55be3a4c96f71bbb6cf7e6fedbf6cdc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +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@o94.at> <david@subsquare.at>
-David Trattnig <david.trattnig@o94.at> <david.trattnig@gmail.com>
+David Trattnig <david@subsquare.at> <david.trattnig@o94.at>
+David Trattnig <david@subsquare.at> <david.trattnig@gmail.com>
 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>
+Ernesto Rico Schmidt <ernesto@helsinki.at> <e.rico.schmidt@gmail.com>
+Ernesto Rico Schmidt <ernesto@helsinki.at> <ernesto@ontolabs.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
+jackie / Andrea Ida Malkah Klaura <jackie@diebin.at> Andrea Ida Malkah Klaura
+Roman Brendler <roman@jointech.org> Roman <roman@jointech.org>
\ No newline at end of file