diff --git a/.mailmap b/.mailmap
index ec5ad1987..f920b448f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,3 +32,4 @@ Peter Pfeiffer	<root@VMipfire.pfeiffer-privat.de>
 Rene Zingel	<linuxadmin@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Ronald Wiesinger	<rowie@ipfire.org>
 Stéphane Pautrel	<steph78630@gmail.com>
+Erik Kapfer		<ummeegge@ipfire.org>
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 51965d302..6770cc5a4 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -83,8 +83,8 @@ Jan Lentfer,
 Marcus Scholz,
 Ersan Yildirim,
 Joern-Ingo Weigert,
-Alfred Haas,
 Wolfgang Apolinarski,
+Alfred Haas,
 Lars Schuhmacher,
 Rene Zingel,
 Sascha Kilian,
@@ -95,8 +95,8 @@ Michael Eitelwein,
 Bernhard Bitsch,
 Dominik Hassler,
 Larsen,
-Gabriel Rolland,
 Stéphane Pautrel,
+Gabriel Rolland,
 Anton D. Seliverstov,
 Bernhard Bittner,
 David Kleuker,
@@ -126,6 +126,7 @@ Logan Schmidt,
 Nico Prenzel,
 Osmar Gonzalez,
 Paul T. Simmons,
+Rob Brewer,
 Robert Möker,
 Stefan Ernst,
 Stefan Ferstl,