diff --git a/README b/README
index 64873f9..42543d1 100644
--- a/README
+++ b/README
@@ -165,8 +165,8 @@
 
    See the CHANGES file.
 
-I hope you find bzip2 useful.  Feel free to contact me at
-   jseward@acm.org
+I hope you find bzip2 useful.  Feel free to contact the developers at
+   bzip2-devel@sourceware.org
 if you have any suggestions or queries.  Many people mailed me with
 comments, suggestions and patches after the releases of bzip-0.15,
 bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
diff --git a/bzip2.c b/bzip2.c
index 76c6c94..01a41d2 100644
--- a/bzip2.c
+++ b/bzip2.c
@@ -748,8 +748,8 @@
    fprintf ( stderr,
              "\n%s: PANIC -- internal consistency error:\n"
              "\t%s\n"
-             "\tThis is a BUG.  Please report it to me at:\n"
-             "\tjseward@acm.org\n",
+             "\tThis is a BUG.  Please report it to:\n"
+             "\tbzip2-devel@sourceware.org\n",
              progName, s );
    showFileNames();
    cleanUpAndFail( 3 );
@@ -829,7 +829,7 @@
       "   The user's manual, Section 4.3, has more info on (1) and (2).\n"
       "   \n"
       "   If you suspect this is a bug in bzip2, or are unsure about (1)\n"
-      "   or (2), feel free to report it to me at: jseward@acm.org.\n"
+      "   or (2), feel free to report it to: bzip2-devel@sourceware.org.\n"
       "   Section 4.3 of the user's manual describes the info a useful\n"
       "   bug report should have.  If the manual is available on your\n"
       "   system, please try and read it before mailing me.  If you don't\n"
@@ -852,7 +852,7 @@
       "   The user's manual, Section 4.3, has more info on (2) and (3).\n"
       "   \n"
       "   If you suspect this is a bug in bzip2, or are unsure about (2)\n"
-      "   or (3), feel free to report it to me at: jseward@acm.org.\n"
+      "   or (3), feel free to report it to: bzip2-devel@sourceware.org.\n"
       "   Section 4.3 of the user's manual describes the info a useful\n"
       "   bug report should have.  If the manual is available on your\n"
       "   system, please try and read it before mailing me.  If you don't\n"
diff --git a/bzlib.c b/bzlib.c
index f9da295..2dbe666 100644
--- a/bzlib.c
+++ b/bzlib.c
@@ -43,12 +43,12 @@
    fprintf(stderr, 
       "\n\nbzip2/libbzip2: internal error number %d.\n"
       "This is a bug in bzip2/libbzip2, %s.\n"
-      "Please report it to me at: jseward@acm.org.  If this happened\n"
+      "Please report it to: bzip2-devel@sourceware.org.  If this happened\n"
       "when you were using some program which uses libbzip2 as a\n"
       "component, you should also report this bug to the author(s)\n"
       "of that program.  Please make an effort to report this bug;\n"
       "timely and accurate bug reports eventually lead to higher\n"
-      "quality software.  Thanks.  Julian Seward, 10 December 2007.\n\n",
+      "quality software.  Thanks.\n\n",
       errcode,
       BZ2_bzlibVersion()
    );
diff --git a/entities.xml b/entities.xml
index 3016674..a415062 100644
--- a/entities.xml
+++ b/entities.xml
@@ -1,6 +1,7 @@
 <!-- misc. strings -->
 <!ENTITY bz-url "https://sourceware.org/bzip2/">
-<!ENTITY bz-email "jseward@acm.org">
+<!ENTITY bz-author "jseward@acm.org">
+<!ENTITY bz-email "bzip2-devel@sourceware.org">
 <!ENTITY bz-lifespan "1996-2010">
 
 <!ENTITY bz-version "1.0.7">
diff --git a/manual.xml b/manual.xml
index b177bbf..b99e480 100644
--- a/manual.xml
+++ b/manual.xml
@@ -653,7 +653,7 @@
 <title>AUTHOR</title>
 
 <para>Julian Seward,
-<computeroutput>&bz-email;</computeroutput></para>
+<computeroutput>&bz-author;</computeroutput></para>
 
 <para>The ideas embodied in
 <computeroutput>bzip2</computeroutput> are due to (at least) the
@@ -2487,12 +2487,12 @@
 <blockquote>
 <para>bzip2/libbzip2: internal error number N.</para>
 <para>This is a bug in bzip2/libbzip2, &bz-version; of &bz-date;.
-Please report it to me at: &bz-email;.  If this happened
+Please report it to: &bz-email;.  If this happened
 when you were using some program which uses libbzip2 as a
 component, you should also report this bug to the author(s)
 of that program.  Please make an effort to report this bug;
 timely and accurate bug reports eventually lead to higher
-quality software.  Thanks.  Julian Seward, &bz-date;.
+quality software.  Thanks.
 </para></blockquote>
 
 <para>where <computeroutput>N</computeroutput> is some error code
@@ -2537,7 +2537,7 @@
 <para>Everything related to Windows has been contributed by
 Yoshioka Tsuneo
 (<computeroutput>tsuneo@rr.iij4u.or.jp</computeroutput>), so
-you should send your queries to him (but perhaps Cc: me,
+you should send your queries to him (but please Cc:
 <computeroutput>&bz-email;</computeroutput>).</para>
 
 <para>My vague understanding of what to do is: using Visual C++