diff --git a/doc/FAQ b/doc/FAQ
index bca9821095952cb39709d37cb1a56d5d8ef9f7c1..54fe384cebb563f61ab74275b42d465afc0c19a2 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -9,7 +9,7 @@
    http://www.PostgreSQL.org/docs/faq-english.html.
    
    Platform-specific questions are answered at
-   http://www.PostgreSQL.org/docs/.
+   http://www.PostgreSQL.org/users-lounge/docs/faq.html.
      _________________________________________________________________
    
                              General Questions
@@ -141,8 +141,8 @@
    
    PostgreSQL Data Base Management System
    
-   Portions copyright (c) 1996-2001, PostgreSQL Global Development Group Portions Copyright
-   (c) 1994-6 Regents of the University of California
+   Portions copyright (c) 1996-2001, PostgreSQL Global Development Group
+   Portions Copyright (c) 1994-6 Regents of the University of California
    
    Permission to use, copy, modify, and distribute this software and its
    documentation for any purpose, without fee, and without a written
@@ -245,7 +245,8 @@
     
    Several manuals, manual pages, and some small test examples are
    included in the distribution. See the /doc directory. You can also
-   browse the manual online at http://www.PostgreSQL.org/docs/postgres.
+   browse the manual online at
+   http://www.PostgreSQL.org/users-lounge/docs/postgres.
    
    There is a PostgreSQL book available at
    http://www.PostgreSQL.org/docs/awbook.html.
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index f534e4d1a9cb05bcaa310e1369bea2e480fd432a..0d4948cbb43ec03865b4121774331602e23b0815 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -23,7 +23,7 @@
     "http://www.Postgresql.org/docs/faq-english.html">http://www.PostgreSQL.org/docs/faq-english.html</A>.</P>
 
     <P>Platform-specific questions are answered at <A href=
-    "http://www.PostgreSQL.org/docs/">http://www.PostgreSQL.org/docs/</A>.</P>
+    "http://www.PostgreSQL.org/users-lounge/docs/faq.html">http://www.PostgreSQL.org/users-lounge/docs/faq.html</A>.</P>
     <HR>
 
     <CENTER>
@@ -324,7 +324,7 @@
     <P>Several manuals, manual pages, and some small test examples are
     included in the distribution. See the <I>/doc</I> directory. You
     can also browse the manual online at <A href=
-    "http://www.PostgreSQL.org/docs/postgres">http://www.PostgreSQL.org/docs/postgres</A>.</P>
+    "http://www.PostgreSQL.org/users-lounge/docs/postgres">http://www.PostgreSQL.org/users-lounge/docs/postgres</A>.</P>
 
     <P>There is a PostgreSQL book available at <A href=
     "http://www.PostgreSQL.org/docs/awbook.html">http://www.PostgreSQL.org/docs/awbook.html</A>.</P>
@@ -499,7 +499,7 @@
     "mailto:postgres95@openlink.co.uk">postgres95@openlink.co.uk</A>.</P>
 
     <P>See also the <A href=
-    "http://www.PostgreSQL.org/docs/programmer/odbc.htm">ODBC chapter
+    "http://www.PostgreSQL.org/users-lounge/docs/programmer/odbc.htm">ODBC chapter
     of the Programmer's Guide</A>.</P>
 
     <H4><A name="2.2">2.2</A>) What tools are available for using