diff --git a/ChangeLog b/ChangeLog
index 6f9c0fcaad3..ab50d5f6fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-09-09  James Greenhalgh  <james.greenhalgh@arm.com>
+
+	* MAINTAINERS (James Greenhalgh): Move to AArch64 maintainers.
+
 2017-07-31  Robin Dapp  <rdapp@linux.vnet.ibm.com>
 
         * MAINTAINERS (write after approval): Add myself.
diff --git a/MAINTAINERS b/MAINTAINERS
index 7effec1287f..2ed1ef99a30 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -39,8 +39,9 @@ their own patches from other maintainers or reviewers.
 
 			CPU Port Maintainers	(CPU alphabetical order)
 
-aarch64 port		Marcus Shawcroft	<marcus.shawcroft@arm.com>
 aarch64 port		Richard Earnshaw	<richard.earnshaw@arm.com>
+aarch64 port		James Greenhalgh	<james.greenhalgh@arm.com>
+aarch64 port		Marcus Shawcroft	<marcus.shawcroft@arm.com>
 alpha port		Richard Henderson	<rth@twiddle.net>
 arc port		Joern Rennecke		<gnu@amylaar.uk>
 arm port		Nick Clifton		<nickc@redhat.com>
@@ -249,7 +250,6 @@ check in changes outside of the parts of the compiler they maintain.
 
 			Reviewers
 
-aarch64 port		James Greenhalgh	<james.greenhalgh@arm.com>
 arc port		Andrew Burgess		<andrew.burgess@embecosm.com>
 arc port		Claudiu Zissulescu	<claziss@synopsys.com>
 arm port		Kyrylo Tkachov		<kyrylo.tkachov@arm.com>