diff --git a/.mailmap b/.mailmap
index 9737bc3685..3cc78251f3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -94,8 +94,8 @@ Erik Hallnor <ehallnor@umich.edu>
 Erik Tomusk <E.Tomusk@sms.ed.ac.uk>
 Faissal Sleiman <Faissal.Sleiman@arm.com> Faissal Sleiman <sleimanf@umich.edu>
 Fernando Endo <fernando.endo2@gmail.com>
-Gabe Black <gabeblack@google.com> Gabe Black <gabe.black@gmail.com>
-Gabe Black <gabeblack@google.com> Gabe Black <gblack@eecs.umich.edu>
+Gabe Black <gabe.black@gmail.com> Gabe Black <gabeblack@google.com>
+Gabe Black <gabe.black@gmail.com> Gabe Black <gblack@eecs.umich.edu>
 Gabor Dozsa <gabor.dozsa@arm.com>
 Gedare Bloom <gedare@rtems.org> Gedare Bloom <gedare@gwmail.gwu.edu>
 Gene Wu <gene.wu@arm.com> Gene WU <gene.wu@arm.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index d248ec1211..913daaf86f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16,7 +16,7 @@ PMC Members (general maintainers):
   Andreas Sandberg <andreas.sandberg@arm.com>
   Brad Beckmann <brad.beckmann@amd.com>
   David Wood <david@cs.wisc.edu>
-  Gabe Black <gabeblack@google.com>
+  Gabe Black <gabe.black@gmail.com>
   Giacomo Travaglini <giacomo.travaglini@arm.com>
   Jason Lowe-Power <jason@lowepower.com> (chair)
   Matt Sinclair <sinclair@cs.wisc.edu>
@@ -24,7 +24,7 @@ PMC Members (general maintainers):
   Steve Reinhardt <stever@gmail.com>
 
 arch: General architecture-specific components
-  Gabe Black <gabeblack@google.com>
+  Gabe Black <gabe.black@gmail.com>
 arch-arm:
   Andreas Sandberg <andreas.sandberg@arm.com>
   Giacomo Travaglini <giacomo.travaglini@arm.com>
@@ -35,9 +35,9 @@ arch-power:
 arch-riscv:
   Alec Roelke <ar4jc@virginia.edu>
 arch-sparc:
-  Gabe Black <gabeblack@google.com>
+  Gabe Black <gabe.black@gmail.com>
 arch-x86:
-  Gabe Black <gabeblack@google.com>
+  Gabe Black <gabe.black@gmail.com>
 
 base:
 
@@ -64,7 +64,7 @@ dev-arm:
 ext: Components external to gem5
 
 fastmodel: Changes relating to ARM Fast Models
-  Gabe Black <gabeblack@google.com>
+  Gabe Black <gabe.black@gmail.com>
 
 gpu-compute:
   Tony Gutierrez <anthony.gutierrez@amd.com>
@@ -90,7 +90,7 @@ python: Python SimObject wrapping and infrastructure
   Andreas Sandberg <andreas.sandberg@arm.com>
 
 scons: Build system
-  Gabe Black <gabeblack@google.com>
+  Gabe Black <gabe.black@gmail.com>
 
 sim: General simulation components
   Jason Lowe-Power <jason@lowepower.com>
@@ -107,10 +107,10 @@ system-arm:
   Giacomo Travaglini <giacomo.travaglini@arm.com>
 
 systemc: Code for the gem5 SystemC implementation and interface
-  Gabe Black <gabeblack@google.com>
+  Gabe Black <gabe.black@gmail.com>
 
 tests: testing changes (not stats updates for tests. See stats:)
   Bobby Bruce <bbruce@ucdavis.edu>
 
 util:
-  Gabe Black <gabeblack@google.com>
+  Gabe Black <gabe.black@gmail.com>