diff --git a/ChangeLog b/ChangeLog
index 0b7e6507bba65012f6c2d603af5d4401d4d8bcc9..234a84057baca93abb1629595cf4fa43167a4c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-01  Zack Weinberg  <zackw@panix.com>
+
+	* MAINTAINERS: Change email address.  Resign from maintainership.
+
 2005-07-01  Richard Guenther  <rguenther@suse.de>
 
 	* MAINTAINERS: Change my e-mail address and affiliation.
diff --git a/MAINTAINERS b/MAINTAINERS
index a1a0cfcf34cda6df4672e778354f5d79f28c5392..a307e4a4004db9d0f5d5d06fcdc321a45b073bf7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -30,7 +30,6 @@ Jason Merrill					jason@redhat.com
 David S. Miller					davem@redhat.com
 Mark Mitchell					mark@codesourcery.com
 Bernd Schmidt					bernd.schmidt@analog.com
-Zack Weinberg					zack@codesourcery.com
 Jim Wilson					wilson@specifixinc.com
 
 
@@ -100,7 +99,6 @@ sco5, unixware, sco udk	Kean Johnston		jkj@sco.com
 sh-linux-gnu		Kaz Kojima		kkojima@gcc.gnu.org
 RTEMS Ports		Joel Sherrill		joel@oarcorp.com
 RTEMS Ports		Ralf Corsepius		ralf.corsepius@rtems.org
-VxWorks ports		Zack Weinberg		zack@codesourcery.com
 VxWorks ports		Nathan Sidwell		nathan@codesourcery.com
 windows, cygwin, mingw	Christopher Faylor	cgf@gcc.gnu.org
 windows, cygwin, mingw	Danny Smith		dannysmith@users.sourceforge.net
@@ -132,7 +130,6 @@ treelang                James A. Morrison	phython@gcc.gnu.org
 
 cpplib			Dave Brolley		brolley@redhat.com
 cpplib			Per Bothner		per@bothner.com
-cpplib			Zack Weinberg		zack@codesourcery.com
 libgcj			Tom Tromey		tromey@redhat.com
 libgcj			Bryce McKinlay		bryce@gcc.gnu.org
 libobjc			Nicola Pero		n.pero@mi.flashnet.it
@@ -326,6 +323,7 @@ Krister Walfridsson				cato@df.lth.se
 Feng Wang					fengwang@nudt.edu.cn
 John Wehle					john@feith.com
 Florian Weimer					fw@deneb.enyo.de
+Zack Weinberg					zackw@panix.com
 Mark Wielaard					mark@gcc.gnu.org
 Carlo Wood					carlo@alinoe.com
 Canqun Yang					canqun@nudt.edu.cn