diff --git a/doc/FAQ b/doc/FAQ
index 69f40498fa75d1ffefd8fa14a7bb410cf868512b..202a758be576b381ec534c92b48d889b905e9d19 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -168,23 +168,10 @@
    
     1.3) What Unix platforms does PostgreSQL run on?
     
-   The authors have compiled and tested PostgreSQL on the following
-   platforms (some of these compiles require gcc):
-     * aix - IBM on AIX 3.2.5 or 4.x
-     * alpha - DEC Alpha AXP on Digital Unix 2.0, 3.2, 4.0
-     * BSD44_derived - OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
-     * bsdi - BSD/OS 2.x, 3.x, 4.x
-     * dgux - DG/UX 5.4R4.11
-     * hpux - HP PA-RISC on HP-UX 9.*, 10.*
-     * i386_solaris - i386 Solaris
-     * irix5 - SGI MIPS on IRIX 5.3
-     * linux - Intel i86 Alpha SPARC PPC M68k
-     * sco - SCO 3.2v5 Unixware
-     * sparc_solaris - SUN SPARC on Solaris 2.4, 2.5, 2.5.1
-     * sunos4 - SUN SPARC on SunOS 4.1.3
-     * svr4 - Intel x86 on Intel SVR4 and MIPS
-     * ultrix4 - DEC MIPS on Ultrix 4.4
-       
+   In general, a modern Unix-compatible platform should be able to run
+   PostgreSQL. The platforms that had received explicit testing at the
+   time of release are listed in the installation instructions.
+   
     1.4) What non-unix ports are available?
     
    It is possible to compile the libpq C library, psql, and other
@@ -246,8 +233,8 @@
    There is also an IRC channel on EFNet, channel #PostgreSQL. I use the
    unix command irc -c '#PostgreSQL' "$USER" irc.phoenix.net.
    
-   Commercial support for PostgreSQL is available at
-   http://www.pgsql.com/.
+   A list of commercial PostgreSQL support is available at
+   http://www.postgresql.org/users-lounge/commercial-support.html.
    
     1.7) What is the latest release?
     
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index fd655a9eadee25548db9c942f0a245f00f9def47..0fce45f71cedb3e355409d7a6563c97b136cb671 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -226,39 +226,9 @@
     <H4><A name="1.3">1.3</A>) What Unix platforms does PostgreSQL run
     on?</H4>
 
-    <P>The authors have compiled and tested PostgreSQL on the following
-    platforms (some of these compiles require gcc):</P>
-
-    <UL>
-      <LI>aix - IBM on AIX 3.2.5 or 4.x</LI>
-
-      <LI>alpha - DEC Alpha AXP on Digital Unix 2.0, 3.2, 4.0</LI>
-
-      <LI>BSD44_derived - OSs derived from 4.4-lite BSD (NetBSD,
-      FreeBSD)</LI>
-
-      <LI>bsdi - BSD/OS 2.x, 3.x, 4.x</LI>
-
-      <LI>dgux - DG/UX 5.4R4.11</LI>
-
-      <LI>hpux - HP PA-RISC on HP-UX 9.*, 10.*</LI>
-
-      <LI>i386_solaris - i386 Solaris</LI>
-
-      <LI>irix5 - SGI MIPS on IRIX 5.3</LI>
-
-      <LI>linux - Intel i86 Alpha SPARC PPC M68k</LI>
-
-      <LI>sco - SCO 3.2v5 Unixware</LI>
-
-      <LI>sparc_solaris - SUN SPARC on Solaris 2.4, 2.5, 2.5.1</LI>
-
-      <LI>sunos4 - SUN SPARC on SunOS 4.1.3</LI>
-
-      <LI>svr4 - Intel x86 on Intel SVR4 and MIPS</LI>
-
-      <LI>ultrix4 - DEC MIPS on Ultrix 4.4</LI>
-    </UL>
+    <P>In general, a modern Unix-compatible platform should be able to
+    run PostgreSQL. The platforms that had received explicit testing at
+    the time of release are listed in the installation instructions.</P>
 
     <H4><A name="1.4">1.4</A>) What non-unix ports are available?</H4>
 
@@ -340,8 +310,10 @@
     <I>#PostgreSQL.</I> I use the unix command <CODE>irc -c
     '#PostgreSQL' "$USER" irc.phoenix.net.</CODE></P>
 
-    <P>Commercial support for PostgreSQL is available at <A href=
-    "http://www.pgsql.com">http://www.pgsql.com/</A>.</P>
+    <P>A list of commercial PostgreSQL support is available at 
+    <A href=
+    "http://www.postgresql.org/users-lounge/commercial-support.html">
+    http://www.postgresql.org/users-lounge/commercial-support.html</A>.</P>
 
     <H4><A name="1.7">1.7</A>) What is the latest release?</H4>