diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 4752d776e..0e12f8b74 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-05  Corinna Vinschen  <corinna@vinschen.de>
+
+	* faq-programming.xml: Convert url to refer to new flat faq.html file.
+	* faq-setup.xml: Ditto.
+	* faq-using.xml: Ditto.
+	* highlights.xml: Ditto.
+
 2013-06-05  Corinna Vinschen  <corinna@vinschen.de>
 
 	* new-features.xml (ov-new1.7.19): Revert mandatory locking support to
diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index 4e8d54864..c01a127e6 100644
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -360,7 +360,7 @@ package at runtime.
 <answer>
 
 <para>Beware of using non-portable shell features in your Makefiles (see tips
-at <ulink url="http://cygwin.com/faq/faq.using.html#faq.using.shell-scripts" />).
+at <ulink url="http://cygwin.com/faq/faq.html#faq.using.shell-scripts" />).
 </para>
 <para>Errors of <literal>make: execvp: /bin/sh: Illegal Argument</literal> or 
 <literal>make: execvp: /bin/sh: Argument list too long</literal> are often
@@ -746,7 +746,7 @@ recommend trying the latest snapshot from
 <ulink url="http://cygwin.com/snapshots/" /> or building the DLL from CVS.
 </para>
 <para>To build a debugging version of the Cygwin DLL, you will need to follow
-the instructions at <ulink url="http://cygwin.com/faq/faq-nochunks.html#faq.programming.building-cygwin" />. 
+the instructions at <ulink url="http://cygwin.com/faq/faq.html#faq.programming.building-cygwin" />. 
 You can also contact the mailing list for pointers (a simple test case that 
 demonstrates the bug is always welcome).  
 </para>
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index 52373f1e4..8339b61f3 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -187,7 +187,7 @@ disk if you are paranoid.
 <para>This should be safe, but only if Cygwin Setup is not substituted by
 something malicious, and no mirror has been compromised.
 </para>
-<para>See also <ulink url="http://cygwin.com/faq/faq.using.html#faq.using.bloda" />
+<para>See also <ulink url="http://cygwin.com/faq/faq.html#faq.using.bloda" />
 for a list of applications that have been known, at one time or another, to
 interfere with the normal functioning of Cygwin.
 </para>
@@ -459,7 +459,7 @@ of Cygwin is as follows:
 <orderedlist>
 <listitem><para>If you have any Cygwin services running, remove by repeating 
 the instructions in <ulink
-url="http://cygwin.com/faq/faq.setup.html#faq.setup.uninstall-service" /> for
+url="http://cygwin.com/faq/faq.html#faq.setup.uninstall-service" /> for
 all services that you installed.  Common services that might have been
 installed are <literal>sshd</literal>, <literal>cron</literal>, 
 <literal>cygserver</literal>, <literal>inetd</literal>, <literal>apache</literal>, 
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index c3a878743..36c898014 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -628,7 +628,7 @@ of poorly written firewall-type software that causes things to break.
 Note that with many of these products, simply disabling the firewall
 does not remove these changes; it must be completely uninstalled.
 </para>
-<para>See also <ulink url="http://cygwin.com/faq/faq.using.html#faq.using.bloda" />
+<para>See also <ulink url="http://cygwin.com/faq/faq.html#faq.using.bloda" />
 for a list of applications that have been known, at one time or another, to 
 interfere with the normal functioning of Cygwin.
 </para>
@@ -778,7 +778,7 @@ contents are exempt from scanning.  In a default installation, this
 would be <literal>C:\cygwin\bin</literal>.  Obviously, this could be
 exploited by a hostile non-Cygwin program, so do this at your own risk.
 </para>
-<para>See also <ulink url="http://cygwin.com/faq/faq.using.html#faq.using.bloda" />
+<para>See also <ulink url="http://cygwin.com/faq/faq.html#faq.using.bloda" />
 for a list of applications that have been known, at one time or another, to
 interfere with the normal functioning of Cygwin.
 </para>
diff --git a/winsup/doc/highlights.xml b/winsup/doc/highlights.xml
index 694a6b3de..5de789a8c 100644
--- a/winsup/doc/highlights.xml
+++ b/winsup/doc/highlights.xml
@@ -271,7 +271,7 @@ location, Cygwin can do nothing to compensate (though it will
 retry a few times automatically).</listitem>
 
 <listitem>DLL injection by
-<ulink url="http://cygwin.com/faq/faq.using.html#faq.using.bloda">
+<ulink url="http://cygwin.com/faq/faq.html#faq.using.bloda">
 BLODA</ulink>. Badly-behaved applications which
 inject dlls into other processes often manage to clobber important
 sections of the child's address space, leading to base address