diff --git a/ChangeLog b/ChangeLog
index a7061ab48fc6..69997546d4be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-01  Josh Conner  <joshconner@google.com>
+
+	* MAINTAINERS (Write After Approval): Update email address,
+
 2016-10-27  Carl Love  <cel@us.ibm.com>
 
 	* MAINTAINERS (Write After Approval): Fix my entry in the Write After
diff --git a/MAINTAINERS b/MAINTAINERS
index 10488870a8fa..343c44b5f238 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -350,7 +350,7 @@ Tamar Christina					<tamar.christina@arm.com>
 Eric Christopher				<echristo@gmail.com>
 William Cohen					<wcohen@redhat.com>
 Michael Collison				<michael.collison@arm.com>
-Josh Conner					<jconner@apple.com>
+Josh Conner					<joshconner@google.com>
 R. Kelley Cook					<kcook@gcc.gnu.org>
 Christian Cornelssen				<ccorn@cs.tu-berlin.de>
 Ludovic Courtès					<ludo@gnu.org>