diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 5b028ba9a..78b431f50 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-23  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+	* faq-programming.xml (faq.programming.objective-c): Update for gcc4.
+	(faq.programming.win32-api): -mwindows does include -lcomdlg32.
+	(faq.programming.win32-no-cygwin): Update for removal of -mno-cygwin.
+	* overview2.sgml (ov-ex-win): Ditto.
+
 2012-04-05  Corinna Vinschen  <corinna@vinschen.de>
 
 	* new-features.sgml (ov-new1.7.13): Add typeahead description.
diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index acb92b99b..4aecdc3bf 100644
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -62,10 +62,9 @@ would be difficult.
 <question><para>Where is Objective C?</para></question>
 <answer>
 
-<para>Objective C hasn't been distributed with the Cygwin version of gcc
-for a long time.  For several reason Cygwin was stuck with gcc version 3.4.4.
-Fortunately the latest gcc maintainer is quite busy to create a working
-gcc 4.x release which also comes with an Objective C package.
+<para>Support for compiling Objective C is available in the <literal>gcc4-objc</literal>
+package; resulting binaries will depend on the <literal>libobjc2</literal>
+package at runtime.
 </para>
 </answer></qandaentry>
 
@@ -177,7 +176,7 @@ with gdi32 like this:
 <para>The regular setup allows you to use the option -mwindows on the
 command line to include a set of the basic libraries (and also
 make your program a GUI program instead of a console program),
-including user32, gdi32 and, IIRC, comdlg32.
+including user32, gdi32 and comdlg32.
 </para>
 <para>It is a good idea to put import libraries last on your link line,
 or at least after all the object files and static libraries that reference them.
@@ -194,11 +193,10 @@ as well as the User's Guide section
 <question><para>How do I compile a Win32 executable that doesn't use Cygwin?</para></question>
 <answer>
 
-<para><emphasis role='bold'>(Please note: This section has not yet been updated for the latest net release.)</emphasis>
-</para>
-<para>The -mno-cygwin flag to gcc makes gcc link against standard Microsoft
-DLLs instead of Cygwin.  This is desirable for native Windows programs
-that don't need a UNIX emulation layer.
+<para>The compilers provided by the <literal>mingw-gcc</literal>,
+<literal>mingw64-i686-gcc</literal>, and <literal>mingw64-x86_64-gcc</literal>
+packages link against standard Microsoft DLLs instead of Cygwin. This is
+desirable for native Windows programs that don't need a UNIX emulation layer.
 </para>
 <para>This is not to be confused with 'MinGW' (Minimalist GNU for Windows),
 which is a completely separate effort.  That project's home page is
diff --git a/winsup/doc/overview2.sgml b/winsup/doc/overview2.sgml
index def02ba38..81e55c47e 100644
--- a/winsup/doc/overview2.sgml
+++ b/winsup/doc/overview2.sgml
@@ -35,9 +35,10 @@ the <literal>/usr/share/doc/Cygwin/</literal> directory.
 <para>
 Developers coming from a Windows background will be able to write 
 console or GUI executables that rely on the Microsoft Win32 API instead
-of Cygwin using the -mno-cygwin option to GCC.  The <command>-shared</command>
-option allows to write Windows Dynamically Linked Libraries (DLLs).  The
-resource compiler <command>windres</command> is also provided.
+of Cygwin using the mingw32 or mingw64 cross-compiler toolchains.  The
+<command>-shared</command> option to GCC allows to write Windows Dynamically
+Linked Libraries (DLLs).  The resource compiler <command>windres</command>
+is also provided.
 </para>
 </sect1>