diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 386b44e9b53..5aa483a64aa 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-03 Phil Edwards
+
+ PR libstdc++/9527, PR libstdc++/8713
+ * docs/html/install.html: Mention glibc version requirement.
+ * docs/html/faq/index.html (3.8): New note, glibc 2.2.5+ is needed
+ with 3.2.1+ (formatting bugfixes).
+ * docs/html/faq/index.txt: Regenerate.
+
2003-02-03 Volker Reichelt
PR libstdc++/9234
diff --git a/libstdc++-v3/docs/html/faq/index.html b/libstdc++-v3/docs/html/faq/index.html
index 4d40397c60f..82bf8f3d608 100644
--- a/libstdc++-v3/docs/html/faq/index.html
+++ b/libstdc++-v3/docs/html/faq/index.html
@@ -499,7 +499,7 @@ which is no longer available, thanks deja...-->
-
+
Support for atomic integer operations is/was broken on i386
platforms. The assembly code accidentally used opcodes that are
only available on the i486 and later. So if you configured GCC
@@ -510,6 +510,18 @@ which is no longer available, thanks deja...-->
This is fixed in 3.2.2.
+
+
+ For 3.2.1 (shared library version 5.0.1) and later, the library
+ uses localization and formatting code from the system C library
+ (glibc) version 2.2.5. That version of glibc is over a year old
+ and contains necessary bugfixes. Many GNU/Linux distros make
+ glibc version 2.3.x available now.
+
+ The guideline is simple: the more recent the C++ library, the
+ more recent the C library.
+
+
Note that this section can get rapdily outdated -- such is the
diff --git a/libstdc++-v3/docs/html/faq/index.txt b/libstdc++-v3/docs/html/faq/index.txt
index c3e3452d5b1..cc43e2f1bb9 100644
--- a/libstdc++-v3/docs/html/faq/index.txt
+++ b/libstdc++-v3/docs/html/faq/index.txt
@@ -396,7 +396,7 @@
solution.
_________________________________________________________________
-Threading is broken on i386
+3.7 Threading is broken on i386
Support for atomic integer operations is/was broken on i386 platforms.
The assembly code accidentally used opcodes that are only available on
@@ -406,6 +406,18 @@ Threading is broken on i386
will the problem appear.
This is fixed in 3.2.2.
+ _________________________________________________________________
+
+3.8 Recent GNU/Linux glibc required?
+
+ For 3.2.1 (shared library version 5.0.1) and later, the library uses
+ localization and formatting code from the system C library (glibc)
+ version 2.2.5. That version of glibc is over a year old and contains
+ necessary bugfixes. Many GNU/Linux distros make glibc version 2.3.x
+ available now.
+
+ The guideline is simple: the more recent the C++ library, the more
+ recent the C library.
_________________________________________________________________
4.0 Known Bugs and Non-Bugs
diff --git a/libstdc++-v3/docs/html/install.html b/libstdc++-v3/docs/html/install.html
index e4295aaa4de..6b2ea066456 100644
--- a/libstdc++-v3/docs/html/install.html
+++ b/libstdc++-v3/docs/html/install.html
@@ -99,7 +99,8 @@
If gcc 3.1.0 or later on is being used on linux, an attempt
will be made to use "C" library functionality necessary for C++
- named locale support.
+ named locale support. For gcc 3.2.1 and later, this means that
+ glibc 2.2.5 or later is required.
The configure option --enable-clocale can be used force a