diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst
index 825311bfdc2..1efa54fcd8a 100644
--- a/Doc/library/gettext.rst
+++ b/Doc/library/gettext.rst
@@ -3,8 +3,8 @@
 
 .. module:: gettext
    :synopsis: Multilingual internationalization services.
-.. moduleauthor:: Barry A. Warsaw <barry@zope.com>
-.. sectionauthor:: Barry A. Warsaw <barry@zope.com>
+.. moduleauthor:: Barry A. Warsaw <barry@python.org>
+.. sectionauthor:: Barry A. Warsaw <barry@python.org>
 
 **Source code:** :source:`Lib/gettext.py`
 
diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst
index 3bdbcf941bc..9404a478802 100644
--- a/Doc/library/pickle.rst
+++ b/Doc/library/pickle.rst
@@ -12,7 +12,7 @@
 .. module:: pickle
    :synopsis: Convert Python objects to streams of bytes and back.
 .. sectionauthor:: Jim Kerr <jbkerr@sr.hp.com>.
-.. sectionauthor:: Barry Warsaw <barry@zope.com>
+.. sectionauthor:: Barry Warsaw <barry@python.org>
 
 
 The :mod:`pickle` module implements a fundamental, but powerful algorithm for
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index fe7258a0fc6..3ebed062609 100644
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -4,7 +4,7 @@
 .. module:: smtpd
    :synopsis: A SMTP server implementation in Python.
 
-.. moduleauthor:: Barry Warsaw <barry@zope.com>
+.. moduleauthor:: Barry Warsaw <barry@python.org>
 .. sectionauthor:: Moshe Zadka <moshez@moshez.org>
 
 **Source code:** :source:`Lib/smtpd.py`