diff --git a/ChangeLog b/ChangeLog
index bae8f29fcf8d..15d8e8fb4c83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-21  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* MAINTAINERS: Move myself from Write After Approval to CPU Port
+	Maintainers section, as Epiphany maintainer.
+
 2011-11-18  Iain Sandoe  <iains@gcc.gnu.org>
 
 	PR target/49992
diff --git a/MAINTAINERS b/MAINTAINERS
index 6c18fe0c4f8f..a4bb5c18bdfb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -55,6 +55,7 @@ bfin port		Bernd Schmidt		bernds@codesourcery.com
 bfin port		Jie Zhang		jzhang918@gmail.com
 c6x port		Bernd Schmidt		bernds@codesourcery.com
 cris port		Hans-Peter Nilsson	hp@axis.com
+epiphany port		Joern Rennecke		joern.rennecke@embecosm.com
 fr30 port		Nick Clifton		nickc@redhat.com
 frv port		Nick Clifton		nickc@redhat.com
 frv port		Alexandre Oliva		aoliva@redhat.com
@@ -468,8 +469,6 @@ Ramana Radhakrishnan				ramana.radhakrishnan@arm.com
 Easwaran Raman					eraman@google.com
 Rolf Rasmussen					rolfwr@gcc.gnu.org
 Volker Reichelt					v.reichelt@netcologne.de
-Joern Rennecke					amylaar@spamcop.net
-Joern Rennecke					joern.rennecke@embecosm.com
 Bernhard Reutner-Fischer			rep.dot.nop@gmail.com
 Tom Rix						trix@redhat.com
 Craig Rodrigues					rodrigc@gcc.gnu.org