diff --git a/.mailmap b/.mailmap
index bd13a630d..850e5fd7b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 Alexander A. Klimov <alexander.klimov@icinga.com> <alexander.klimov@icinga.com>
+Alvar Penning <alvar.penning@icinga.com> <8402811+oxzi@users.noreply.github.com>
 Diana Flach <crunsher@bamberg.ccc.de> <Crunsher@users.noreply.github.com>
 Diana Flach <crunsher@bamberg.ccc.de> <jean-marcel.flach@icinga.com>
 Diana Flach <crunsher@bamberg.ccc.de> <jean.flach@icinga.com>
diff --git a/AUTHORS b/AUTHORS
index 7971eb292..5f2666a9c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ Eric Lippmann <eric.lippmann@icinga.com>
 Feu Mourek <feu.mourek@icinga.com>
 Henrik Triem <henrik.triem@icinga.com>
 Johannes Meyer <johannes.meyer@icinga.com>
+Jonada Hoxha <jonada.hoxha@icinga.com>
 Julian Brost <julian.brost@icinga.com>
 Michael Friedrich <michael.friedrich@icinga.com>
 Noah Hilverling <noah.hilverling@icinga.com>