diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ddd5f9fe5..4c7f1906a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -53,6 +53,10 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>September 12th, 2002 [gerard]: Chapter 06 - GCC: Added the
+<emphasis>--enable-clocale=gnu</emphasis> option to ensure the proper
+locale mode is used by the C++ libraries.</para></listitem>
+
 <listitem><para>September 11th, 2002 [timothy]: Preface: Grammatic
 changes.</para></listitem>
 
diff --git a/chapter06/gcc-exp.xml b/chapter06/gcc-exp.xml
index b05214795..38ce93aa5 100644
--- a/chapter06/gcc-exp.xml
+++ b/chapter06/gcc-exp.xml
@@ -5,5 +5,15 @@
 in C++ shared libraries and C++ programs that are interoperable with other
 linux distributions.</para>
 
+<para><userinput>--enable-clocale=gnu:</userinput> There is a risk that
+some people will build ABI incompatible C++ libraries if they didn't install
+all the glibc localedata. Using --enable-clocale=gnu ensures that the "right
+thing" is done in all cases. If you don't want to use this option and don't
+want to build all the locales, then at least make sure you installed the
+<emphasis>de_DE</emphasis> locale with Glibc, since that's the specific locale
+GCC will check for to determine which locale mode to use (if de_DE is
+found, <emphasis>gnu</emphasis> mode is used, which is the corrent one to
+use).</para>
+
 </sect2>
 
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index a3a024a4f..3a3b4b2c5 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -27,7 +27,8 @@ mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --enable-threads=posix \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-slibdir=/lib --enable-__cxa_atexit &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--with-slibdir=/lib --enable-__cxa_atexit \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-clocale=gnu &amp;&amp;
 make bootstrap &amp;&amp;
 make install &amp;&amp;
 ln -s ../usr/bin/cpp /lib &amp;&amp;