diff --git a/.mailmap b/.mailmap
index bdb19d322..2db3df0f2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -36,3 +36,4 @@ Michael Insel <mcktr55@gmail.com> <michael@insel.email>
 Marianne Spiller <github@spiller.me>
 Robin O'Brien <robin@labs.epiuse.com> <robinjohnobrien@gmail.com>
 <noah.hilverling@icinga.com> <noah@hilverling.com>
+<pe-git@hindenburgring.com> <pe-icinga2@hindenburgring.com>
diff --git a/AUTHORS b/AUTHORS
index 9110940e8..a54157b98 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -50,6 +50,7 @@ Dolf Schimmel <dolf@transip.nl>
 Edgar Fuß <ef@math.uni-bonn.de>
 Eduard Güldner <eduard.gueldner@gmail.com>
 Edvin Seferovic <edvin@seferovic.net>
+Elias Ohm <eohm@novomind.com>
 Eric Lippmann <eric.lippmann@icinga.com>
 Evgeni Golov <evgeni@golov.de>
 Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
@@ -106,6 +107,7 @@ Leon Stringer <leon@priorsvle.com>
 Louis Sautier <sautier.louis@gmail.com>
 Luca Lesinigo <luca@lm-net.it>
 Lucas Fairchild-Madar <lucas.madar@gmail.com>
+Luiz Amaral <luiz.amaral@innogames.com>
 Magnus Bäck <magnus@noun.se>
 Malte Rabenseifner <mail@malte-rabenseifner.de>
 Manuel Reiter <reiter@csc.uni-frankfurt.de>
@@ -147,7 +149,6 @@ Paul Richards <paul@minimoo.org>
 Pawel Szafer <pszafer@gmail.com>
 Per von Zweigbergk <pvz@itassistans.se>
 Peter Eckel <pe-git@hindenburgring.com>
-Peter Eckel <pe-icinga2@hindenburgring.com>
 Petr Ruzicka <petr.ruzicka@gmail.com>
 Phil Hutchinson <phil@volumedia.co.uk>
 Philipp Dallig <philipp.dallig@gmail.com>
@@ -212,6 +213,7 @@ gitmopp <mopp@gmx.net>
 jre3brg <jorge.rebelo@pt.bosch.com>
 krishna <gskrishna44@gmail.com>
 lihan <tclh123@gmail.com>
+marxin <mliska@suse.cz>
 mocruz <mocruz@theworkshop.com>
 noobahoi <20069422+noobahoi@users.noreply.github.com>
 pv2b <pvz@pvz.pp.se>