diff --git a/ChangeLog b/ChangeLog
index 9a98c5e4a86..68132bddde3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-22  Mark Mitchell  <mark@codesourcery.com>
+
+	* MAINTAINERS (cpplib): Rename to ...
+	(libcpp): ... this.  Add C/C++ front end maintainers.
+
 2007-04-14  Steve Ellcey  <sje@cup.hp.com>
 
 	* config-ml.in: Pass ${ml_config_env} to configure calls.
diff --git a/MAINTAINERS b/MAINTAINERS
index 83505e3fb82..27dfdf83880 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -144,7 +144,8 @@ treelang                James A. Morrison	phython@gcc.gnu.org
 
 			Various Maintainers
 
-cpplib			Per Bothner		per@bothner.com
+libcpp			Per Bothner		per@bothner.com
+libcpp			All C and C++ front end maintainers
 fp-bit			Ian Lance Taylor	ian@airs.com
 libdecnumber		Ben Elliston		bje@au.ibm.com
 libgcc			Ian Lance Taylor	ian@airs.com