diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dc56f54939c..649c017d860 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-17  Jonathan Wakely  <redi@gcc.gnu.org>
+
+	* docs/html/21_strings/gotw29a.txt: Update code to corrected version.
+
 2005-06-17  Jakub Jelinek  <jakub@redhat.com>
             Benjamin Kosnik  <bkoz@redhat.com>
 
diff --git a/libstdc++-v3/docs/html/21_strings/gotw29a.txt b/libstdc++-v3/docs/html/21_strings/gotw29a.txt
index d823f30504e..9326604855e 100644
--- a/libstdc++-v3/docs/html/21_strings/gotw29a.txt
+++ b/libstdc++-v3/docs/html/21_strings/gotw29a.txt
@@ -119,10 +119,14 @@ the easiest way:
       while( n-- > 0 && tolower(*s) != tolower(a) ) {
           ++s;
       }
-      return s;
+      return n >= 0 ? s : 0;
     }
   };
 
+[N.B. A bug in the original code has been fixed for the
+GCC documentation, the corrected code was taken from
+Herb Sutter's book, Exceptional C++]
+
 And finally, the key that brings it all together:
 
   typedef basic_string<char, ci_char_traits> ci_string;