diff --git a/ChangeLog b/ChangeLog
index 5b8b941dadab39cef17c7f6bccc4a1e54f26ea27..c8448f75ff5508e5a71fea9942ce77f3656ab133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-21  Erik Edelmann  <eedelman@gcc.gnu.org>
+
+	* MAINTAINERS (Write After Approval):  Remove myself.
+	(Language Front End Maintainers):  Add myself as fortran 95 maintainer.
+
 2006-02-21 Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
 	* Makefile.tpl  (BUILD_CONFIGDIRS): Remove
 	(TARGET_CONFIGDIRS): Remove
diff --git a/MAINTAINERS b/MAINTAINERS
index c397e6a3407b8c3db3bc902da4c2043c147569d7..f88e9e497b48a7dd3096fb135f16f04cc6b4c32b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -119,6 +119,7 @@ fortran 95		Jerry DeLisle		jvdelisle@gcc.gnu.org
 fortran 95		François-Xavier Coudert	coudert@clipper.ens.fr
 fortran 95              Bud Davis               jmdavis@link.com
 fortran 95		Steve Kargl		sgk@troutmask.apl.washington.edu
+fortran 95              Erik Edelmann           erik.edelmann@iki.fi
 c++			Jason Merrill		jason@redhat.com
 c++                     Mark Mitchell		mark@codesourcery.com
 c++			Nathan Sidwell		nathan@codesourcery.com
@@ -240,7 +241,6 @@ Christian Cornelssen				ccorn@cs.tu-berlin.de
 Ian Dall					ian@beware.dropbear.id.au
 David Daney					ddaney@avtrex.com
 Zdenek Dvorak					dvorakz@suse.cz
-Erik Edelmann                                   erik.edelmann@iki.fi
 Steve Ellcey					sje@cup.hp.com
 Mohan Embar					gnustuff@thisiscool.com
 Marc Espie					espie@cvs.openbsd.org