diff --git a/ChangeLog b/ChangeLog
index 7ad9348ac0aa15c3e14bf34665bbc1b80a1ffa51..162e2c0cb58995e31629ee8060f1faac4b8da7e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-04  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* MAINTAINERS: Add Richard Henderson as libgomp maintainer.
+	Rearrange the entries of other libraries to have them in one place.
+
 2006-03-22  Janne Blomqvist  <jb@gcc.gnu.org>
 
 	* MAINTAINERS (Write After Approval): Remove myself. 
diff --git a/MAINTAINERS b/MAINTAINERS
index d081beec93a599882c37d70136de8d3c5a776fff..8f1146439337ae816554586f934d697dd4836601 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -143,6 +143,10 @@ cpplib			Per Bothner		per@bothner.com
 libdecnumber		Ben Elliston		bje@au.ibm.com
 libgcj			Tom Tromey		tromey@redhat.com
 libgcj			Bryce McKinlay		mckinlay@redhat.com
+libgomp                 Richard Henderson       rth@redhat.com
+libiberty		DJ Delorie		dj@redhat.com
+libiberty		Ian Lance Taylor	ian@airs.com
+libffi testsuite	Andreas Tobler		andreast@gcc.gnu.org
 libobjc			Nicola Pero		n.pero@mi.flashnet.it
 libobjc			Andrew Pinski		pinskia@physics.uc.edu
 loop discovery		Michael Hayes		m.hayes@elec.canterbury.ac.nz
@@ -174,8 +178,6 @@ basic block reordering	Jason Eckhardt		jle@rice.edu
 i18n			Philipp Thomas		pthomas@suse.de
 i18n			Joseph Myers		jsm@polyomino.org.uk
 diagnostic messages	Gabriel Dos Reis	gdr@integrable-solutions.net
-libiberty		DJ Delorie		dj@redhat.com
-libiberty		Ian Lance Taylor	ian@airs.com
 build machinery (*.in)	DJ Delorie		dj@redhat.com
 build machinery (*.in)	Nathanael Nerode	neroden@gcc.gnu.org
 build machinery (*.in)	Alexandre Oliva		aoliva@redhat.com
@@ -186,7 +188,6 @@ contrib/regression	Geoff Keating		geoffk@geoffk.org
 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
 testsuite		Janis Johnson		janis187@us.ibm.com
 middle-end		Roger Sayle		roger@eyesopen.com
 middle-end		Ian Lance Taylor	ian@airs.com