diff --git a/.mailmap b/.mailmap
index 6c1ec786b6b08a813df652ffbd2ed3b637f966cb..238d7bfe32023eaf22909fd9237ee8dc8909cf86 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,11 +1,17 @@
 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>
+David Trattnig <david@subsquare.at> <david.trattnig@o94.at>
+David Trattnig <david@subsquare.at> <david.trattnig@gmail.com>
+Christian Pointner <equinox@helsinki.at> <equinox@spreadspace.org>
+Christian Pointner <equinox@helsinki.at> <equinox@equinox-laptop.chaos-at-home.org>
+Ernesto Rico Schmidt <ernesto@helsinki.at> <e.rico.schmidt@gmail.com>
+Ernesto Rico Schmidt <ernesto@helsinki.at> <ernesto@ontolabs.com>
+Ernesto Rico Schmidt <ernesto@helsinki.at> <ernesto@rico-schmidt.name>
+Ernesto Rico Schmidt <ernesto@helsinki.at> <ernesto.rico-schmidt@evolaris.net>
+Ernesto Rico Schmidt <ernesto@helsinki.at> <ers@Dell-XPS.(none)>
+Johannes Raggam <raggam-nl@adm.at> <thetetet@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
+jackie / Andrea Ida Malkah Klaura <jackie@diebin.at> Andrea Ida Malkah Klaura
+Roman Brendler <roman@jointech.org> Roman <roman@jointech.org>
+EorlBruder <david@jointech.org> <eorl@bruder.space>
\ No newline at end of file