diff --git a/ChangeLog b/ChangeLog
index e2cf977a18d9f20ca9a2c8f10a87d1c7476a64d2..0dbc8fc3bf09a553892ee8cd98a73236dcff1574 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-16  Thomas Koenig  <Thomas.Koenig@online.de>
+
+	* MAINTAINERS (Write After Approval):  Remove myself.
+	(Language Front End Maintainers):  Add myself as
+	fortran 95 maintainer.
+
 2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
 
 	Sync from src:
diff --git a/MAINTAINERS b/MAINTAINERS
index 7bf897a0c73c2c60d297b4f30243671be408ba85..53e203785e4df3dad70af6dd4b2d075ea4a96862 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -113,6 +113,7 @@ Ada front end		Geert Bosch		bosch@gnat.com
 Ada front end		Robert Dewar		dewar@gnat.com
 Ada front end		Arnaud Charlet		charlet@act-europe.fr
 fortran 95		Paul Brook		paul@codesourcery.com
+fortran 95              Thomas Koenig           Thomas.Koenig@online.de
 fortran 95		Toon Moene		toon@moene.indiv.nluug.nl
 c++			Jason Merrill		jason@redhat.com
 c++                     Mark Mitchell		mark@codesourcery.com
@@ -272,7 +273,6 @@ Mumit Khan					khan@xraylith.wisc.edu
 Matthias Klose					doko@debian.org
 Jeff Knaggs					jknaggs@redhat.com
 Michael Koch					konqueror@gmx.de
-Thomas Koenig					Thomas.Koenig@online.de
 Matt Kraai					kraai@ftbfs.org
 Andreas Krebbel					krebbel1@de.ibm.com
 Maxim Kuvyrkov					mkuvyrkov@ispras.ru