diff --git a/doc/FAQ b/doc/FAQ
index a2fb694fd5a..fae3bbe9a57 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,7 +1,7 @@
 
                 Frequently Asked Questions (FAQ) for PostgreSQL
                                        
-   Last updated: Wed Jul 26 13:33:21 EDT 2000
+   Last updated: Thu Jul 27 12:52:35 EDT 2000
    
    Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
    
@@ -226,14 +226,14 @@
    has received around 30k of messages.
    
    The bugs mailing list is available. To subscribe to this list, send
-   email to bugs-request@PostgreSQL.org with a body of:
+   email to pgsql-bugs-request@PostgreSQL.org with a body of:
    
         subscribe
         end
 
    There is also a developers discussion mailing list available. To
-   subscribe to this list, send email to hackers-request@PostgreSQL.org
-   with a body of:
+   subscribe to this list, send email to
+   pgsql-hackers-request@PostgreSQL.org with a body of:
    
         subscribe
         end
@@ -307,7 +307,8 @@
    
     1.13) How do I submit a bug report?
     
-   Fill out the "bug-template" file and send it to: bugs@PostgreSQL.org
+   Fill out the "bug-template" file and send it to:
+   pgsql-bugs@PostgreSQL.org
    
    Also check out our ftp site ftp://ftp.PostgreSQL.org/pub to see if
    there is a more recent PostgreSQL version or patches.
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index 9a1bdd1dd09..8206819c631 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -7,7 +7,7 @@
 Frequently Asked Questions (FAQ) for PostgreSQL
 </H1>
 <P>
-Last updated:		Wed Jul 26 13:33:21 EDT 2000
+Last updated:		Thu Jul 27 12:52:35 EDT 2000
 <P>
 Current maintainer:	Bruce Momjian (<A
 HREF="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</A>)<BR><P>
@@ -294,7 +294,7 @@ received around 30k of messages.<P>
 
 The bugs mailing list is available.  To subscribe to this list, send email
 to <A
-HREF="mailto:bugs-request@PostgreSQL.org">bugs-request@PostgreSQL.org</A>
+HREF="mailto:pgsql-bugs-request@PostgreSQL.org">pgsql-bugs-request@PostgreSQL.org</A>
 with a body of:<P>
 
 <PRE>
@@ -304,7 +304,7 @@ with a body of:<P>
 
 There is also a developers discussion mailing list available.  To
 subscribe to this list, send email to <A
-HREF="mailto:hackers-request@PostgreSQL.org">hackers-request@PostgreSQL.org</A>
+HREF="mailto:pgsql-hackers-request@PostgreSQL.org">pgsql-hackers-request@PostgreSQL.org</A>
 with a body of:<P>
 
 <PRE>
@@ -401,7 +401,7 @@ committed were of high quality.
 <H4><A NAME="1.13">1.13</A>) How do I submit a bug report?</H4><P>
 
 Fill out the "bug-template" file and send it to:  <A
-HREF="mailto:bugs@PostgreSQL.org">bugs@PostgreSQL.org</A><P>
+HREF="mailto:pgsql-bugs@PostgreSQL.org">pgsql-bugs@PostgreSQL.org</A><P>
 
 Also check out our ftp site <A
 HREF="ftp://ftp.PostgreSQL.org/pub">ftp://ftp.PostgreSQL.org/pub</A> to