diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index bcc5c78655..63e667cde9 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-20  Maciej W. Rozycki  <macro@mips.com>
+
+	* MAINTAINERS: Update my e-mail address, downgrade to MIPS I-IV
+	ISA maintenance.
+
 2018-07-20  Nick Clifton  <nickc@redhat.com>
 
 	* objcopy.c (add_specific_symbols): Free buffer on exit.
diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS
index 20445e96a8..17317f8fc1 100644
--- a/binutils/MAINTAINERS
+++ b/binutils/MAINTAINERS
@@ -102,7 +102,7 @@ responsibility among the other maintainers.
   MEP		   Dave Brolley <brolley@redhat.com>
   METAG            Markos Chandras <markos.chandras@imgtec.com>
   MICROBLAZE	   Michael Eager <eager@eagercon.com>
-  MIPS		   Maciej W. Rozycki <macro@mips.com>
+  MIPS I-IV	   Maciej W. Rozycki <macro@linux-mips.org>
   MMIX		   Hans-Peter Nilsson <hp@bitrange.com>
   MN10300	   Alexandre Oliva <aoliva@redhat.com>
   Moxie		   Anthony Green <green@moxielogic.com>
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d13c9ef0ce..cada9471ce 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-20  Maciej W. Rozycki  <macro@mips.com>
+
+	* MAINTAINERS: Update my e-mail address, downgrade to MIPS I-IV
+	ISA maintenance.
+
 2018-07-20  Maciej W. Rozycki  <macro@mips.com>
 
 	* mips-linux-nat.c (mips_linux_nat_target::read_description):
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index eb39be8366..b49a75fb45 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -270,8 +270,8 @@ the native maintainer when resolving ABI issues.
 			--target=microblaze-linux-gnu ,-Werror
 			Michael Eager		eager@eagercon.com
 
-	mips		--target=mips-elf ,-Werror
-			Maciej W. Rozycki	macro@mips.com
+	mips I-IV	--target=mips-elf ,-Werror
+			Maciej W. Rozycki	macro@linux-mips.org
 
 	mn10300		--target=mn10300-elf broken
 			(sim/ dies with make -j)
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 91b7d70282..2d690d706d 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-20  Maciej W. Rozycki  <macro@mips.com>
+
+	* MAINTAINERS: Update my e-mail address, downgrade to MIPS I-IV
+	ISA maintenance.
+
 2018-07-19  DJ Delorie  <dj@redhat.com>
 
 	* MAINTAINERS (rl78, m32c, rx, v850): Remove myself as maintainer.
diff --git a/sim/MAINTAINERS b/sim/MAINTAINERS
index e4a7314e6b..ccd5a9c3cd 100644
--- a/sim/MAINTAINERS
+++ b/sim/MAINTAINERS
@@ -25,7 +25,7 @@ lm32		Jon Beniston <jon@beniston.com>
 m32r		Doug Evans <dje@sebabeach.org>
 m68hc11		Stephane Carrez <Stephane.Carrez@gmail.com>
 microblaze	Michael Eager <eager@eagercon.com>
-mips		Maciej W. Rozycki <macro@mips.com>
+mips I-IV	Maciej W. Rozycki <macro@linux-mips.org>
 moxie		Anthony Green <green@moxielogic.com>
 msp430		Nick Clifton <nickc@redhat.com>
 or1k		Stafford Horne <shorne@gmail.com>