diff --git a/.mailmap b/.mailmap
index 5a9212aea..8d5174989 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,3 +28,4 @@ Michael Tremer	<root@rowena.ipfire.org>
 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>
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 1b231121e..21b3c0881 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -104,6 +104,8 @@ Hans Horsten,
 Jakub Ratajczak,
 Jorrit de Jonge,
 Przemek Zdroik,
+Stéphane Pautrel,
+Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
 Bernhard Held,
@@ -128,7 +130,6 @@ Paul T. Simmons,
 Robert Möker,
 Stefan Ernst,
 Stefan Ferstl,
-Stéphane,
 Thomas Ebert,
 Tim FitzGeorge,
 Timmothy Wilson,