diff --git a/winsup/doc/highlights.xml b/winsup/doc/highlights.xml
index 67e326cb4..e1c05c5a4 100644
--- a/winsup/doc/highlights.xml
+++ b/winsup/doc/highlights.xml
@@ -87,9 +87,9 @@ that the root path is <filename>C:\Cygwin</filename>.  So it looks for the
 <filename>fstab</filename> file in <filename>C:\Cygwin\etc\fstab</filename>. 
 The layout of this file is very similar to the layout of the
 <filename>fstab</filename> file on Linux.  Just instead of block devices,
-the mount points point to Win32 paths.  An installation with
-<command>setup.exe</command> installs a <filename>fstab</filename> file by
-default, which can easily be changed using the editor of your choice.</para>
+the mount points point to Win32 paths.  On installation, a default
+<filename>fstab</filename> file is created, which can easily be changed
+using the editor of your choice.</para>
 
 <para>The <filename>fstab</filename> file allows mounting arbitrary Win32
 paths into the POSIX file system space.  A special case is the so-called
diff --git a/winsup/doc/intro.xml b/winsup/doc/intro.xml
index c68345979..a38609990 100644
--- a/winsup/doc/intro.xml
+++ b/winsup/doc/intro.xml
@@ -56,7 +56,7 @@
       <title>NOTES</title>
       <para>To port applications you will need to install the development tools,
       which you can do by selecting <package>gcc</package> in
-      <emphasis>setup.exe</emphasis> (dependencies are automatically handled).
+      the Cygwin Setup program (dependencies are automatically handled).
       If you need a specific program or library, you can search for a
       <emphasis>Cygwin</emphasis> package containing it at:</para>
       <para>
diff --git a/winsup/doc/ov-ex-unix.xml b/winsup/doc/ov-ex-unix.xml
index c47a3992b..28e351bc8 100644
--- a/winsup/doc/ov-ex-unix.xml
+++ b/winsup/doc/ov-ex-unix.xml
@@ -21,17 +21,18 @@ than most UNIX-like operating systems; these are described in more detail in
 <xref linkend="using-effectively"></xref>.
 </para>
 <para>
-Use the graphical command <command>setup.exe</command> any time you want
-to update or install a Cygwin package.  This program must be run
-manually every time you want to check for updated packages since Cygwin
+Use the graphical Cygwin Setup program (available from the
+<ulink url="https://cygwin.com/">Cygwin homepage</ulink>)
+any time you want to update or install a Cygwin package.  This program must
+be run manually every time you want to check for updated packages since Cygwin
 does not currently include a mechanism for automatically detecting
 package updates.
 </para>
 <para>
-By default, <command>setup.exe</command> only installs a minimal subset of
+By default, the Cygwin Setup program only installs a minimal subset of
 packages.  Add any other packages by clicking on the <literal>+</literal>
 next to the Category name and selecting the package from the displayed
-list.  You may search for specfic tools by using the
+list.  You may search for specific tools by using the
 <ulink url="https://cygwin.com/packages/">Setup Package Search</ulink>
 at the Cygwin web site.
 </para>
@@ -40,9 +41,8 @@ After installation, you can find Cygwin-specific documentation in
 the <literal>/usr/share/doc/Cygwin/</literal> directory.
 </para>
 <para>
-For more information about what each option in
-<command>setup.exe</command> means, see <xref
-linkend="internet-setup"></xref>.
+For more information about what each option in Cygwin Setup means,
+see <xref linkend="internet-setup"></xref>.
 </para>
 
 </sect1>
diff --git a/winsup/doc/ov-ex-win.xml b/winsup/doc/ov-ex-win.xml
index 9a24021a7..7b5bf033e 100644
--- a/winsup/doc/ov-ex-win.xml
+++ b/winsup/doc/ov-ex-win.xml
@@ -12,19 +12,19 @@ to become acquainted with UNIX basics (search for "UNIX basics" or
 "UNIX tutorial"). 
 </para>
 <para>
-To install a basic Cygwin environment, run the
-<command>setup.exe</command> program and click <literal>Next</literal>
+To install a basic Cygwin environment, run the Cygwin Setup program from
+the <ulink url="https://cygwin.com/">Cygwin homepage</ulink> and click
+<literal>Next</literal>
 at each page.  The default settings are correct for most users. If you
 want to know more about what each option means, see 
-<xref linkend="internet-setup"></xref>. Use <command>setup.exe</command>
+<xref linkend="internet-setup"></xref>. Use the Cygwin Setup program
 any time you want to update or install a Cygwin package.  If you are
 installing Cygwin for a specific purpose, use it to install the tools
 that you need. For example, if you want to compile C++ programs, you 
 need the <systemitem>gcc-g++</systemitem> package and probably a text
-editor like <systemitem>nano</systemitem>.  When running
-<command>setup.exe</command>, clicking on categories and packages in the
-package installation screen will provide you with the ability to control
-what is installed or updated. 
+editor like <systemitem>nano</systemitem>.  When running Cygwin Setup,
+clicking on categories and packages in the package installation screen
+will provide you with the ability to control what is installed or updated. 
 </para>
 <para>
 After installation, you can find Cygwin-specific documentation in
diff --git a/winsup/doc/overview.xml b/winsup/doc/overview.xml
index aaaaef0cd..4d312c714 100644
--- a/winsup/doc/overview.xml
+++ b/winsup/doc/overview.xml
@@ -100,10 +100,9 @@ the GNU configure mechanism. Self hosting was achieved as of the beta
 The entire Cygwin toolset was available as a monolithic install. In
 April 2000, the project announced a
 <ulink url="https://www.cygwin.com/ml/cygwin/2000-04/msg00269.html">
-New Cygwin Net Release</ulink> which provided the native non-Cygwin Win32 program
-<command>setup.exe</command> to install and upgrade each package
-separately. Since then, the Cygwin DLL and <command>setup.exe</command> 
-have seen continuous development.
+New Cygwin Net Release</ulink> which provided a graphical non-Cygwin
+Setup program to install and upgrade each package separately. Since then,
+the Cygwin DLL and the Setup tool have seen continuous development.
 </para>
 
 <para>