diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
index b107c02b02304da6cd21dc8255a5dfc8153715bf..9b1de856b0038ade1379e17dd9c9956bf7c8f287 100644
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@ -37,7 +37,7 @@
 <!entity diskusage     SYSTEM "diskusage.sgml">
 <!entity high-availability      SYSTEM "high-availability.sgml">
 <!entity installation  SYSTEM "installation.sgml">
-<!entity installw      SYSTEM "install-win32.sgml">
+<!entity installw      SYSTEM "install-windows.sgml">
 <!entity maintenance   SYSTEM "maintenance.sgml">
 <!entity manage-ag     SYSTEM "manage-ag.sgml">
 <!entity monitoring    SYSTEM "monitoring.sgml">
diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-windows.sgml
similarity index 99%
rename from doc/src/sgml/install-win32.sgml
rename to doc/src/sgml/install-windows.sgml
index 50c28ebdc0c17e12b6755dccd6a41cc1caab2b03..4bf890e759718c3ebbafaa71f6c4cf64abc0afc8 100644
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -1,6 +1,6 @@
-<!-- doc/src/sgml/install-win32.sgml -->
+<!-- doc/src/sgml/install-windows.sgml -->
 
-<chapter id="install-win32">
+<chapter id="install-windows">
  <title>Installation from Source Code on <productname>Windows</productname></title>
 
  <indexterm>
@@ -56,7 +56,7 @@
   binaries are built using <productname>Visual Studio</productname>.
  </para>
 
- <sect1 id="install-win32-full">
+ <sect1 id="install-windows-full">
   <title>Building with <productname>Visual C++</productname> or the
   <productname>Platform SDK</productname></title>
 
@@ -436,7 +436,7 @@ $ENV{DOCROOT}='c:\docbook';
 
  </sect1>
 
- <sect1 id="install-win32-libpq">
+ <sect1 id="install-windows-libpq">
   <title>Building <application>libpq</application> with
   <productname>Visual C++</productname> or
   <productname>Borland C++</productname></title>
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index f3659ba0dd297dc629861ce83cde1de1fe81b754..5c3cecd840df48c2ecead3632d8f4b2ea51a4dfb 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -2455,7 +2455,7 @@ createlang: language installation failed: ERROR:  could not load library "/opt/d
    <para>
     PostgreSQL can be built using Cygwin, a Linux-like environment for
     Windows, but that method is inferior to the native Windows build
-    <![%standalone-ignore[(see <xref linkend="install-win32">)]]> and
+    <![%standalone-ignore[(see <xref linkend="install-windows">)]]> and
     is no longer recommended.
    </para>
 
@@ -2706,7 +2706,7 @@ cc-1020 cc: ERROR File = pqcomm.c, Line = 427
     The MinGW build variant uses the normal build system described in
     this chapter; the Visual C++ build works completely differently
     and is described in <![%standalone-include[the
-    documentation]]><![%standalone-ignore[<xref linkend="install-win32">]]>.
+    documentation]]><![%standalone-ignore[<xref linkend="install-windows">]]>.
     It is a fully native build and uses no additional software like
     MinGW.  A ready-made installer is available on the main
     PostgreSQL web site.
diff --git a/doc/src/sgml/release-9.0.sgml b/doc/src/sgml/release-9.0.sgml
index d928f6c5ffa4cde7e0222659c553ef7c1229927f..2392e71dc898d4349a90e516c1c9f917377a3517 100644
--- a/doc/src/sgml/release-9.0.sgml
+++ b/doc/src/sgml/release-9.0.sgml
@@ -66,7 +66,7 @@
 
     <listitem>
      <para>
-      Full support for <link linkend="install-win32">64-bit
+      Full support for <link linkend="install-windows">64-bit
       <productname>Windows</></link>.
      </para>
     </listitem>
@@ -2781,7 +2781,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      <listitem>
       <para>
        Support compiling on <link
-       linkend="install-win32">64-bit
+       linkend="install-windows">64-bit
        <productname>Windows</></link> and running in 64-bit
        mode (Tsutomu Yamada, Magnus Hagander)
       </para>
@@ -2794,7 +2794,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      <listitem>
       <para>
        Support server builds using <link
-       linkend="install-win32-full"><productname>Visual Studio
+       linkend="install-windows-full"><productname>Visual Studio
        2008</></link> (Magnus Hagander)
       </para>
      </listitem>