diff --git a/ChangeLog b/ChangeLog
index f1b1b5b7fd1..90bdd093b34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-23  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* MAINTAINERS: Move myself from 'Write After Approval' to
+	'Various Maintainers' section as libffi testsuite maintainer.
+
 2003-09-21  Daniel Jacobowitz  <drow@mvista.com>
 
 	* configure.in: Pass a computed --program-transform-name
diff --git a/MAINTAINERS b/MAINTAINERS
index c7107e16bf8..0f8427d19d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -160,6 +160,7 @@ new regalloc (ra*)	Michael Matz		matz@suse.de
 gcov			Jan Hubicka		jh@suse.cz
 gcov			Nathan Sidwell		nathan@codesourcery.com
 option handling		Neil Booth		neil@daikokuya.co.uk
+libffi testsuite	Andreas Tobler		andreast@gcc.gnu.org
 
 Note individuals who maintain parts of the compiler need approval to check
 in changes outside of the parts of the compiler they maintain.
@@ -261,7 +262,6 @@ Jeff Sturm					jsturm@gcc.gnu.org
 Ian Taylor					ian@wasabisystems.com
 Michael Tiemann					tiemann@redhat.com
 Kresten Krab Thorup				krab@gcc.gnu.org
-Andreas Tobler					andreast@gcc.gnu.org
 Jonathan Wakely					redi@gcc.gnu.org
 Krister Walfridsson				cato@df.lth.se
 John Wehle					john@feith.com