diff --git a/.mailmap b/.mailmap
index 3f4317e0dd02c0..a400b3efd436fd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -305,6 +305,7 @@ Nitzan Uziely <linkgoron@gmail.com> <nitzan@testim.io>
 Noah Rose Ledesma <noahroseledesma@seattleacademy.org>
 Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
 Onne Gorter <onne@onnlucky.com>
+Paul Graham <homosaur@gmail.com> <paul@bytefair.com>
 Paul Querna <pquerna@apache.org> <paul@querna.org>
 Pedro Lima <pvsousalima@gmail.com>
 Peng Lyu <penn.lv@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 5c4ddb8815bb1e..ffc7608edcda58 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1275,7 +1275,7 @@ Michael-Bryant Choa <mbchoa@gmail.com>
 CodeVana <codevaana@gmail.com>
 Daniel Sims <danielsims@quickenloans.com>
 Diego Paez <paez.di@gmail.com>
-Paul Graham <paul@bytefair.com>
+Paul Graham <homosaur@gmail.com>
 Jared Young <jared.young@panasonic.aero>
 vazina robertson <vazina.robertson@gmail.com>
 Bruce Lai <bruceplai@gmail.com>
@@ -1324,7 +1324,6 @@ malen <malenesok007@yahoo.com>
 Kailean Courtney <kailean@gmail.com>
 Fumiya KARASAWA <krswfmy@gmail.com>
 John Barboza <jbarboza@ca.ibm.com>
-Paul Graham <homosaur@gmail.com>
 Nate <nfoxley@stedwards.edu>
 Chris Story <storytimesolutions@gmail.com>
 Matthew Garrett <mjg59@coreos.com>