diff --git a/.mailmap b/.mailmap
index 2ccdcb9ce..2b3a980c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -85,6 +85,7 @@ Scott González <scott.gonzalez@gmail.com> <sgonzale@sgonzale-laptop.local>
 Scott Jehl <scottjehl@gmail.com> <scott@scottjehl.com>
 Sebastian Burkhard <sebi.burkhard@gmail.com>
 Senya Pugach <upisfree@outlook.com>
+Thomas Tortorini <thomastortorini@gmail.com> Mr21
 Timmy Willison <timmywillisn@gmail.com>
 Timmy Willison <timmywillisn@gmail.com> <tim.willison@thisismedium.com>
 Timo Tijhof <krinklemail@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index d8403cb73..01e868688 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -246,7 +246,7 @@ Anne-Gaelle Colom <coloma@westminster.ac.uk>
 George Mauer <gmauer@gmail.com>
 Leonardo Braga <leonardo.braga@gmail.com>
 Stephen Edgar <stephen@netweb.com.au>
-Mr21 <thomastortorini@gmail.com>
+Thomas Tortorini <thomastortorini@gmail.com>
 Winston Howes <winstonhowes@gmail.com>
 Jon Hester <jon.d.hester@gmail.com>
 Alexander O'Mara <me@alexomara.com>
@@ -259,4 +259,3 @@ Chris Rebert <github@rebertia.com>
 Gabriel Schulhof <gabriel.schulhof@intel.com>
 Gilad Peleg <giladp007@gmail.com>
 Martin Naumann <martin@geekonaut.de>
-Thomas Tortorini <thomastortorini@gmail.com>