diff --git a/doc/FAQ_german b/doc/FAQ_german
index 65312c2bb30dc702d52033d77e636819fa949222..127ea98ecc9076332120900154fbc0ceb26f1445 100644
--- a/doc/FAQ_german
+++ b/doc/FAQ_german
@@ -3,7 +3,7 @@
                                        
    Last updated: Sat Jul 10 00:37:57 EDT 1999
    
-   Current maintainer: Bruce Momjian (maillist@candle.pha.pa.us)
+   Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
    
    Deutsche �bersetzung von Karsten Schulz (schulz@linux-systemhaus.de)
    
diff --git a/doc/src/FAQ/FAQ_german.html b/doc/src/FAQ/FAQ_german.html
index 2a956f06b9db39c4db29d09ca0729c47c1cf79e9..e133ef361b5742713f12b3531d7501cb88bd8fac 100644
--- a/doc/src/FAQ/FAQ_german.html
+++ b/doc/src/FAQ/FAQ_german.html
@@ -10,7 +10,7 @@ Häufig gestellte Fragen (FAQ) zu PostgreSQL
 Last updated:		Sat Jul 10 00:37:57 EDT 1999
 <P>
 Current maintainer:	Bruce Momjian (<a
-href="mailto:maillist@candle.pha.pa.us">maillist@candle.pha.pa.us</a>)	<BR>
+href="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</a>)	<BR>
 <P>
 Deutsche &Uuml;bersetzung von Karsten Schulz (<A HREF="mailto:schulz@linux-systemhaus.de">schulz@linux-systemhaus.de</a>)	<BR>
 <P>
diff --git a/src/tools/backend/backend_dirs.html b/src/tools/backend/backend_dirs.html
index 63b4a3421aa0b10ce66a3afc0413606a47d909b7..cc4e16d9aa2929b5c8bc1bbc8be9a1f481dc42c2 100644
--- a/src/tools/backend/backend_dirs.html
+++ b/src/tools/backend/backend_dirs.html
@@ -423,7 +423,7 @@ This does processing for the rules system.
 <SMALL>
 <ADDRESS>
 Maintainer:	Bruce Momjian (<A
-HREF="mailto:maillist@candle.pha.pa.us">maillist@candle.pha.pa.us</A>)<BR>
+HREF="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)<BR>
 Last updated:		Tue Dec  9 17:56:08 EST 1997
 </ADDRESS>
 </SMALL>
diff --git a/src/tools/backend/index.html b/src/tools/backend/index.html
index cfcc6c6ac9962e3a060fd3233676646790479221..78b8b8e5fac562846c81f50d56390273eacfc5e2 100644
--- a/src/tools/backend/index.html
+++ b/src/tools/backend/index.html
@@ -159,7 +159,7 @@ HREF="../../backend/storage/ipc/shmem.c">ShmemInitHash().</A><P>
 <SMALL>
 <ADDRESS>
 Maintainer:	Bruce Momjian (<A
-HREF="mailto:maillist@candle.pha.pa.us">maillist@candle.pha.pa.us</A>)<BR>
+HREF="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)<BR>
 Last updated:		Mon Aug 10 10:48:06 EDT 1998
 </ADDRESS>
 </SMALL>
diff --git a/src/tools/make_diff/README b/src/tools/make_diff/README
index 59e87c020ee017b621e86c0d0e22d3c7ea3df993..c287133a00464779e1508b7ef82721b265c5655b 100644
--- a/src/tools/make_diff/README
+++ b/src/tools/make_diff/README
@@ -1,4 +1,4 @@
-Bruce Momjian <maillist@candle.pha.pa.us>
+Bruce Momjian <pgman@candle.pha.pa.us>
 
 Here are some of the scripts I use to make development easier.