diff --git a/MAINTAINERS b/MAINTAINERS
index c3f6498404a..4f75f969c20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -263,15 +263,15 @@ Fortran			Janus Weil		janus@gcc.gnu.org
 Graphite		Daniel Berlin		dberlin@dberlin.org
 Graphite 		Tobias Grosser		grosser@fim.uni-passau.de
 Graphite		Sebastian Pop		sebastian.pop@amd.com
-Plug-in			Rafael Espíndola	rafael.espindola@gmail.com
+Plugin			Rafael Espíndola	espindola@google.com
 register allocation	Peter Bergner		bergner@vnet.ibm.com
 register allocation	Vladimir Makarov	vmakarov@redhat.com
 register allocation	Kenneth Zadeck		zadeck@naturalbridge.com
 register allocation	Seongbae Park		seongbae.park@gmail.com
 LTO			Diego Novillo		dnovillo@google.com
 LTO			Richard Guenther	rguenther@suse.de
-LTO			Rafael Espíndola	rafael.espindola@gmail.com
-LTO plugin		Rafael Espíndola	rafael.espindola@gmail.com
+LTO			Rafael Espíndola	espindola@google.com
+LTO plugin		Rafael Espíndola	espindola@google.com
 LTO plugin		Cary Coutant		ccoutant@google.com
 
 Note that while reviewers can approve changes to parts of the compiler