diff --git a/.mailmap b/.mailmap
index 19c8811d513138..97d73f9a68660a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -120,6 +120,7 @@ Doug Wade <doug@dougwade.io> <doug.wade@redfin.com>
 Eduard Burtescu <eddy_me08@yahoo.com>
 Einar Otto Stangvik <einaros@gmail.com>
 Elliott Cable <me@ell.io>
+Emanuel Buholzer <contact@emanuelbuholzer.com> <EmanuelBuholzer@outlook.com>
 Eric Bickle <wolf.code@outlook.com> <ebickle@users.noreply.github.com>
 Eric Phetteplace <phette23@gmail.com>
 Ernesto Salazar <ernestoalbertosalazar@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 693878d20788f3..4c80e974e8c582 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1306,7 +1306,6 @@ Neeraj Sharma <nitsnwits@gmail.com>
 Ashita Nagesh <ashita.nagesh@gmail.com>
 Jason Wohlgemuth <jhwohlgemuth@gmail.com>
 Segu Riluvan <rilwan22@hotmail.com>
-Emanuel Buholzer <EmanuelBuholzer@outlook.com>
 Avery, Frank <FrankAvery@quickenloans.com>
 Chase Starr <chasestarr@gmail.com>
 sivaprasanna <sivaprasanna@gmail.com>