diff --git a/.mailmap b/.mailmap
index 7f227a34..2831416e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,6 +5,7 @@ eliott <eliott@cactuswax.net> <elij.mx@gmail.com>
 Giovanni Scafora <giovanni@archlinux.org> <linuxmania@gmail.com>
 Jason Chu <jason@archlinux.org> <jchu>
 Laszlo Papp <djszapi@archlinux.us> <djszapi2@gmail.com>
+Lukas Fleischer <lfleischer@archlinux.org> <archlinux@cryptocrack.de>
 Mod Gao <mod.gao@gmail.com>
 Mod Gao <mod.gao@gmail.com> <mod.gao@gmail,com>
 Paul Mattal <paul@mattal.com> <pjmattal>
diff --git a/AUTHORS b/AUTHORS
index b1e4379f..8bcbfafa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,7 @@
 Current Maintainers
 -------------------
 
-* Lukas Fleischer (cryptocrack) <archlinux@cryptocrack.de>
+* Lukas Fleischer <lfleischer@archlinux.org>
 
 Past Maintainers
 ----------------