diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index aca4a736cb7..d374db8c53a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-10  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* docs/html/21_strings/howto.html: Add links to referenced articles.
+
 2007-12-10  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* docs/html/17_intro/backwards_compatibility.html: Fix markup.
diff --git a/libstdc++-v3/docs/html/21_strings/howto.html b/libstdc++-v3/docs/html/21_strings/howto.html
index d5cd24d4ddb..bdc868a02dc 100644
--- a/libstdc++-v3/docs/html/21_strings/howto.html
+++ b/libstdc++-v3/docs/html/21_strings/howto.html
@@ -159,7 +159,7 @@
 <hr />
 <h2><a name="2">A case-insensitive string class</a></h2>
    <p>The well-known-and-if-it-isn't-well-known-it-ought-to-be
-      <a href="http://www.gotw.ca/gotw/index.htm">Guru of the Week</a>
+      <a href="http://www.gotw.ca/gotw/">Guru of the Week</a>
       discussions held on Usenet covered this topic in January of 1998.
       Briefly, the challenge was, &quot;write a 'ci_string' class which
       is identical to the standard 'string' class, but is
@@ -177,19 +177,15 @@
    assert( strcmp( s.c_str(), "AbCdE" ) == 0 );
    assert( strcmp( s.c_str(), "abcde" ) != 0 ); </pre>
 
-   <p>The solution is surprisingly easy.  The original answer pages
-      on the GotW website were removed into cold storage, in
-      preparation for
-      <a href="http://cseng.aw.com/bookpage.taf?ISBN=0-201-61562-2">a
-      published book of GotW notes</a>.  Before being
-      put on the web, of course, it was posted on Usenet, and that
-      posting containing the answer is <a href="gotw29a.txt">available
-      here</a>.
+   <p>The solution is surprisingly easy.  The <a href="gotw29a.txt">original
+      answer</a> was posted on Usenet, and a revised version appears in
+      Herb Sutter's book <em>Exceptional C++</em> and on his website as
+      <a href="http://www.gotw.ca/gotw/029.htm">GotW 29</a>.
    </p>
    <p>See?  Told you it was easy!</p>
-   <p><strong>Added June 2000:</strong>  The May issue of <u>C++ Report</u>
-      contains
-      a fascinating article by Matt Austern (yes, <em>the</em> Matt Austern)
+   <p><strong>Added June 2000:</strong> The May 2000 issue of <u>C++ Report</u>
+      contains a fascinating <a href="http://lafstern.org/matt/col2_new.pdf">
+      article</a> by Matt Austern (yes, <em>the</em> Matt Austern)
       on why case-insensitive comparisons are not as easy as they seem,
       and why creating a class is the <em>wrong</em> way to go about it in
       production code.  (The GotW answer mentions one of the principle