diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index 5234414b1..c0ddd7902 100644
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -15,18 +15,15 @@ volunteers to prepare and maintain packages, because the priority of the
 Cygwin Team is Cygwin itself.
 </para>
 <para>The Cygwin Package Contributor's Guide at
-<ulink url="https://cygwin.com/setup.html"/> details everything you need to know
-about being a package maintainer. The quickest way to get started is to
-read the <emphasis>Initial packaging procedure, script-based</emphasis> section on
-that page.  The <literal>generic-build-script</literal> found there works well for
-most packages. 
+<ulink url="https://cygwin.com/packages.html"/> details everything you need to know
+about Cygwin packaging.
 </para>
 <para>For questions about package maintenance, use the cygwin-apps mailing
 list (start at <ulink url="https://cygwin.com/lists.html"/>) <emphasis>after</emphasis>
 searching and browsing the cygwin-apps list archives, of course.  Be
 sure to look at the <emphasis>Submitting a package</emphasis> checklist at
-<ulink url="https://cygwin.com/setup.html"/> before sending an ITP (Intent To
-Package) email to cygwin-apps.
+<ulink url="https://cygwin.com/packaging-contributors-guide.html#submitting"/>
+before sending an ITP (Intent To Package) email to cygwin-apps.
 </para>
 <para>You should also announce your intentions to the general cygwin list, in
 case others were thinking the same thing.
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index bb26b839a..c62e03996 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -610,7 +610,7 @@ installed distribution.
 <para>Probably because there is nobody willing or able to maintain it.  It
 takes time, and the priority for the Cygwin Team is the Cygwin package.
 The rest is a volunteer effort.  Want to contribute?  See
-<ulink url="https://cygwin.com/setup.html"/>.
+<ulink url="https://cygwin.com/packaging.html"/>.
 </para>
 </answer></qandaentry>
 
diff --git a/winsup/doc/setup-net.xml b/winsup/doc/setup-net.xml
index c66fe1f42..211bbed69 100644
--- a/winsup/doc/setup-net.xml
+++ b/winsup/doc/setup-net.xml
@@ -254,11 +254,7 @@ in <filename>/etc/passwd</filename>.
 <sect2 id="setup-postinstall"><title>Post-Install Scripts</title>
 <para>
 Last of all, <command>setup.exe</command> will run any post-install
-scripts to finish correctly setting up installed packages. Since each
-script is run separately, several windows may pop up. If you are 
-interested in what is being done, see the Cygwin Package Contributor's
-Guide at <ulink 
-url="https://cygwin.com/setup.html"/>
+scripts to finish correctly setting up installed packages.
 When the last post-install script is completed, <command>setup.exe</command> 
 will display a box announcing the completion. A few packages, such as
 the OpenSSH server, require some manual site-specific configuration.