diff --git a/ChangeLog b/ChangeLog
index f2cf5f7d86351d88befee43009351d7063ab7e5f..e7fe8fa5c952ddb7db7126efef459f0d9b86e547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-08-16  Alexandre Oliva <oliva@gnu.org>
+
+	* MAINTAINERS: aoliva from @redhat.com to @gcc.gnu.org.
+
 2019-08-13  Mark Eggleston  <mark.eggleston@codethink.co.uk>
 
 	* MAINTAINERS (Write After Approval): Add myself.
diff --git a/MAINTAINERS b/MAINTAINERS
index 912663c44978bca427688db3af71d4c6edea6f9c..5d8402949bc04480fb3b820989e3e07877852690 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -64,7 +64,7 @@ c-sky port		Yunhai Shang		<yunhai_shang@c-sky.com>
 epiphany port		Joern Rennecke		<gnu@amylaar.uk>
 fr30 port		Nick Clifton		<nickc@redhat.com>
 frv port		Nick Clifton		<nickc@redhat.com>
-frv port		Alexandre Oliva		<aoliva@redhat.com>
+frv port		Alexandre Oliva		<aoliva@gcc.gnu.org>
 ft32 port		James Bowman		<james.bowman@ftdichip.com>
 h8 port			Jeff Law		<law@redhat.com>
 hppa port		Jeff Law		<law@redhat.com>
@@ -83,7 +83,7 @@ microblaze		Michael Eager		<eager@eagercon.com>
 mips port		Matthew Fortune		<mfortune@gmail.com>
 mmix port		Hans-Peter Nilsson	<hp@bitrange.com>
 mn10300 port		Jeff Law		<law@redhat.com>
-mn10300 port		Alexandre Oliva		<aoliva@redhat.com>
+mn10300 port		Alexandre Oliva		<aoliva@gcc.gnu.org>
 moxie port		Anthony Green		<green@moxielogic.com>
 msp430 port		Nick Clifton		<nickc@redhat.com>
 nds32 port		Chung-Ju Wu		<jasonwucj@gmail.com>
@@ -105,7 +105,7 @@ rx port			Nick Clifton		<nickc@redhat.com>
 s390 port		Hartmut Penner		<hepenner@us.ibm.com>
 s390 port		Ulrich Weigand		<uweigand@de.ibm.com>
 s390 port		Andreas Krebbel		<krebbel@linux.ibm.com>
-sh port			Alexandre Oliva		<aoliva@redhat.com>
+sh port			Alexandre Oliva		<aoliva@gcc.gnu.org>
 sh port			Oleg Endo		<olegendo@gcc.gnu.org>
 sparc port		David S. Miller		<davem@redhat.com>
 sparc port		Eric Botcazou		<ebotcazou@libertysurf.fr>
@@ -213,7 +213,7 @@ diagnostic messages	Dodji Seketeli		<dodji@redhat.com>
 diagnostic messages	David Malcolm		<dmalcolm@redhat.com>
 build machinery (*.in)	Paolo Bonzini		<bonzini@gnu.org>
 build machinery (*.in)	Nathanael Nerode	<neroden@gcc.gnu.org>
-build machinery (*.in)	Alexandre Oliva		<aoliva@redhat.com>
+build machinery (*.in)	Alexandre Oliva		<aoliva@gcc.gnu.org>
 build machinery (*.in)	Ralf Wildenhues		<Ralf.Wildenhues@gmx.de>
 docs co-maintainer	Gerald Pfeifer		<gerald@pfeifer.com>
 docs co-maintainer	Joseph Myers		<joseph@codesourcery.com>