diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d7f55253073..0c675635f34 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-08  Paolo Carlini  <pcarlini@suse.de>
+
+	* docs/html/install.html: Adjust consistently with libstdc++/31717.
+
 2007-06-08  Francesco Palagi  <palagi@arcetri.astro.it>
 
 	* include/std/fstream: Add Table 92 in comment.
diff --git a/libstdc++-v3/docs/html/install.html b/libstdc++-v3/docs/html/install.html
index 10841486d45..2e887b7c382 100644
--- a/libstdc++-v3/docs/html/install.html
+++ b/libstdc++-v3/docs/html/install.html
@@ -80,8 +80,9 @@
       information must be installed.
 
       <p>
-      The configure option --enable-clocale can be used force a
-      particular behavior.
+      Note that those sanity checks are also perfomed when an explicit
+      --enable-clocale=gnu configure option is used:  this behavior is
+      new in gcc 4.2.1 and defends against misconfigurations.
       </p>
 
       <p>