diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index b6b152e4e..4ac26cc84 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -1419,4 +1419,57 @@ such as virtual memory paging and file caching.</para>
   difficult to make <literal>fork()</literal> work reliably.</para>
 </answer>
 </qandaentry>
+
+<qandaentry id='faq.using.fixing-find_fast_cwd-warnings'>
+  <question><para>How do I fix <literal>find_fast_cwd</literal> warnings?</para></question>
+  <answer>
+    <para>Older Cygwin releases asked users to report problems to the mailing
+	list with the message:</para>
+
+    <screen>find_fast_cwd: WARNING: Couldn't compute FAST_CWD pointer. Please report
+	this problem to the public mailing list cygwin@cygwin.com</screen>
+
+    <para>Recent Cygwin releases changed this to the message:</para>
+
+    <screen>This typically occurs if you're using an older Cygwin version on a newer Windows.
+	Please update to the latest available Cygwin version from https://cygwin.com/.
+	If the problem persists, please see https://cygwin.com/problems.html."</screen>
+
+    <para>This happens when the Cygwin release you installed can not find out
+	how to get your current directory from the Windows release you are
+	using.</para>
+    <para>Unfortunately some projects and products still distribute older
+	Cygwin releases, which do not support newer Windows releases, rather
+	than having their product install the current Cygwin release over the
+	Internet.
+	They also provide no information about keeping Cygwin up to date with
+	upgrades and fixes.</para>
+    <para>The fix is simply downloading and running Cygwin Setup, using the
+	instructions at: 
+	<ulink url="https://cygwin.com/cygwin-ug-net/setup-net.html">
+	    Setting Up Cygwin - Internet Setup</ulink>.</para>
+    <para>When running Setup, you should not change most of the values
+	presented, just select the <strong>Next</strong> button in most cases,
+	as you already have a Cygwin release installed and only want to upgrade
+	your current installation.  You should make your own selection if the
+	internet connection to your system requires a proxy, and you have to
+	pick an up to date Cygwin download (mirror) site, preferably the site
+	nearest to your system for faster downloads, as shown with more details on 
+	<ulink url="https://cygwin.com/mirrors.html">
+	    Mirror Sites</ulink>.</para>
+    <para>Cygwin Setup will download and apply updates to all packages required
+	for Cygwin itself and installed applications.
+	Any problems with applying updates or the application after updates should be
+	reported to the project or product vendor for follow up action.</para>
+    <para>As Cygwin is a volunteer project, and we can not provide support for
+	older releases installed by projects or products, but would like to be
+	able to follow up to reduce these issues, it would be helpful if you
+	would send us a quick
+	<ulink url="mailto:cygwin@cygwin.com&subject=Source%20of%20application%20providing%20Cygwin%20warning%20about%20FAST_CWD">
+	    email</ulink> to let us know about the source of the application
+	which installed the older Cygwin release: whether it was purchased from
+	a vendor or a project downloaded from the Internet, any related web
+	pages, or other details you may have readily available.</para>
+  </answer>
+</qandaentry>
 </qandadiv>