diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..013c839ed6b
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+# This file sets the canonical name for contributors to the repository.
+# Documentation: https://git-scm.com/docs/gitmailmap
+Amethyst Reese <amethyst@n7.gg> <john@noswap.com>
diff --git a/Misc/ACKS b/Misc/ACKS
index 65be5cfc3c7..42ec059a7c4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1488,7 +1488,7 @@ John Redford
 Kalyan Reddy
 Terry J. Reedy
 Gareth Rees
-John Reese
+Amethyst Reese
 Steve Reeves
 Lennart Regebro
 John Regehr