diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 392f06d63..39e2240d3 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-12  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
+
+	* faq-programming.xml: Add note about struct stat64.
+
 2005-12-03  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
 
 	* faq-setup.xml: Add note about clean_setup.pl.
diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index af08be354..856e93c37 100644
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -705,6 +705,14 @@ This is right <literal>gcc hello.cc -lstdc++</literal>.
 </para>
 </answer></qandaentry>
 
+<qandaentry id="faq.programming.stat64">
+<question><para>Why do I get an error using <literal>struct stat64</literal>?</para></question>
+<answer>
+
+<para><literal>struct stat64</literal> is not used in Cygwin, just
+use <literal>struct stat</literal>.</para>
+</answer></qandaentry>
+
 <qandaentry id="faq.programming.undeclared-functions">
 <question><para>I use a function I know is in the API, but I still get a link error.</para></question>
 <answer>