diff --git a/ChangeLog b/ChangeLog
index 89b52906ff48be7f9ea3d69c5475a7748929c58d..055b2e2ff885bf78c7f084e3dd994d22fa135df2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-11  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* Add self as cpplib maintainer, as requested by Jason
+	Merrill.  Correct my e-mail address.
+
 2000-01-06  Geoff Keating  <geoffk@cygnus.com>
 
 	* configure.in: Use mt-aix43 to handle *_TARGET defs,
diff --git a/MAINTAINERS b/MAINTAINERS
index 8b2f64c95d4780dda808d25422d0df7a747348fb..fff91ea8d556ca76c074706ce94c20d61f1e13e1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -51,6 +51,7 @@ java			Alexandre Petit-Bianco	apbianco@cygnus.com
 objective-c		Ovidiu Predescu		ovidiu@cup.hp.com
 cpplib			Dave Brolley		brolley@cygnus.com
 cpplib			Per Bothner		per@bothner.com
+cpplib			Zack Weinberg		zack@wolery.cumb.org
 fixincludes		Ian Taylor		ian@cygnus.com
 alias analysis		John Carr		jfc@mit.edu
 loop unrolling		Jim Wilson		wilson@cygnus.com
@@ -118,7 +119,6 @@ Franz Sirl					franz.sirl-kernel@lauterbach.com
 Mike Stump					mrs@windriver.com
 Tom Tromey					tromey@cygnus.com
 John Wehle					john@feith.com
-Zack Weinberg					zack@bitmover.com
 Martin v. Löwis					loewis@informatik.hu-berlin.de
 
 * Indicates folks we need to get Kerberos/ssh accounts ready so they