diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index aaa5178f04fc..fd96457b9754 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-07  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* doc/xml/faq.xml: Adjust link to bug database.
+	Remove old item on broken header files.
+
 2011-02-04  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/regex_error.h (__throw_regex_error): Not inline.
diff --git a/libstdc++-v3/doc/xml/faq.xml b/libstdc++-v3/doc/xml/faq.xml
index f8e6312386a4..05e805e90a5f 100644
--- a/libstdc++-v3/doc/xml/faq.xml
+++ b/libstdc++-v3/doc/xml/faq.xml
@@ -745,7 +745,7 @@
     </para> 
     <para> 
     Before reporting a bug, please examine the
-    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://gcc.gnu.org/bugs.html">bugs database</link> with the
+    <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://gcc.gnu.org/bugs/">bugs database</link> with the
     category set to <quote>g++</quote>. 
     </para> 
   </answer>
@@ -848,17 +848,9 @@
   </question>
   <answer xml:id="a-v2_headers">
       <para>
-	If you have found an extremely broken header file which is
-	causing problems for you, look carefully before submitting a
-	"high" priority bug report (which you probably
-	shouldn't do anyhow; see the last paragraph of the page
-	describing <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://gcc.gnu.org/bugs.html">the GCC
-	bug database</link>).
-      </para>
-      <para>
-	If the headers are in <filename>${prefix}/include/g++-3</filename>, or
-	if the installed library's name looks like
-	<filename>libstdc++-2.10.a</filename> or
+	If you are using headers in
+	<filename>${prefix}/include/g++-3</filename>, or if the installed
+	library's name looks like <filename>libstdc++-2.10.a</filename> or
 	<filename>libstdc++-libc6-2.10.so</filename>, then you are using the
 	old libstdc++-v2 library, which is nonstandard and
 	unmaintained.  Do not report problems with -v2 to the -v3