diff --git a/.mailmap b/.mailmap
index 7628795f907..71b6697c8b7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,3 +26,6 @@ Thomas Clark <the.thomas.j.clark@gmail.com>
 Thomas Clark <the.thomas.j.clark@gmail.com> <tjclark@wpi.edu>
 anonymous <support@lmms.io> Locale updater <>
 grejppi <grejppi@gmail.com>
+Johannes Lorenz <j.git@lorenz-ho.me> <johannes89@mailueberfall.de>
+Johannes Lorenz <j.git@lorenz-ho.me> <1042576+JohannesLorenz@users.noreply.github.com>
+Noah Brecht <noahb2713@gmail.com>
diff --git a/doc/AUTHORS b/doc/AUTHORS
index 8dc5a303972..6cc8a57a751 100644
--- a/doc/AUTHORS
+++ b/doc/AUTHORS
@@ -67,7 +67,7 @@ Tobiasz Karoń (unfa)
   UI Developer
 
 Johannes Lorenz
-  <johannes89/at/mailueberfall/dot/de>
+  <j/dot/git/at/lorenz/minus/ho/dot/de>
   Developer
 
 Rubén Ibarra Pastor