Index: bootscripts/common/profile.xml
===================================================================
--- bootscripts/common/profile.xml	(revision 1772546205069f1d3d7d1dab76d0ddaf3a660ea2)
+++ bootscripts/common/profile.xml	(revision 50c470c84288214682ae22401ee55f9eb9b4f703)
@@ -95,6 +95,45 @@
 <screen><computeroutput>ISO-8859-1</computeroutput></screen>
 
-  <para>This results in a final locale setting of
-  <quote>en_GB.ISO-8859-1</quote>.</para>
+  <para>This results in a final locale setting of <quote>en_GB.ISO-8859-1</quote>.
+  It is important that the locale found using the heuristic above is tested prior
+  to it being added to the Bash startup files:</para>
+
+<screen><userinput>LC_ALL=[locale name] locale country
+LC_ALL=[locale name] locale language
+LC_ALL=[locale name] locale charmap
+LC_ALL=[locale name] locale int_curr_symbol
+LC_ALL=[locale name] locale int_prefix</userinput></screen>
+
+  <para>The above commands should print the country and language names, the
+  character encoding used by the locale, the local currency and the prefix
+  to dial before the telephone number in order to get into the country. If
+  any of the commands above fail with a message similar to the one shown
+  below, this means that your locale was either not installed in Chapter 6
+  or is not supported by the default installation of Glibc.</para>
+
+<screen><computeroutput>locale: Cannot set LC_* to default locale: No such file or directory</computeroutput></screen>
+
+  <para>If this happens, you should either install the desired locale using
+  the <command>localedef</command> command, or consider choosing a different
+  locale. Further instructions assume that there are no such error messages
+  from Glibc.</para>
+
+  <para>Some packages beyond LFS may also lack support for your chosen locale.
+  One example is the X library (part of the X Window System), which outputs
+  the following error message:</para>
+
+<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
+
+  <para>Sometimes it is possible to fix this by removing the charmap part of
+  the locale specification, as long as that does not change the character map
+  that Glibc associates with the locale (this can be checked by running the
+  <command>locale charmap</command> command in both locales). For example,
+  one would have to change &quot;de_DE.ISO-8859-15@euro&quot; to
+  &quot;de_DE@euro&quot; in order to get this locale recognized by Xlib.</para>
+
+  <para>Other packages can also function incorrectly (but may not necessarily
+  display any error messages) if the locale name does not meet their expectations.
+  In those cases, investigating how other Linux distributions support your locale
+  might provide some useful information.</para>
 
   <para>Once the proper locale settings have been determined, create the
Index: final-system/common/glibc.xml
===================================================================
--- final-system/common/glibc.xml	(revision 1772546205069f1d3d7d1dab76d0ddaf3a660ea2)
+++ final-system/common/glibc.xml	(revision 50c470c84288214682ae22401ee55f9eb9b4f703)
@@ -157,5 +157,6 @@
 
     <para>To save time, an alternative to running the previous command (which
-    generates and installs every locale Glibc is aware of) is to install only
+    generates and installs every locale listed in the
+    glibc-&glibc-version;/localedata/SUPPORTED file) is to install only
     those locales that are wanted and needed. This can be achieved by using
     the <command>localedef</command> command. Information on this command is
@@ -189,9 +190,10 @@
     writing order.  Numerous unofficial and unstable patches are required to
     fix these problems, and it has been decided by the LFS developers not to
-    support such complex locales.  This applies to the ja_JP and fa_IR locales
-    as well&mdash;they have been installed only for GCC and Gettext tests to
-    pass, and the <command>watch</command> program (part of the Procps package)
-    does not work properly in them. Various attempts to circumvent these
-    restrictions are documented in internationalization-related hints.</para>
+    support such complex locales at this time. This applies to the ja_JP and
+    fa_IR locales as well&mdash;they have been installed only for GCC and
+    Gettext tests to pass, and the <command>watch</command> program (part of
+    the Procps package) does not work properly in them. Various attempts to
+    circumvent these restrictions are documented in internationalization-related
+    hints.</para>
 
   </sect2>
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 1772546205069f1d3d7d1dab76d0ddaf3a660ea2)
+++ introduction/common/changelog.xml	(revision 50c470c84288214682ae22401ee55f9eb9b4f703)
@@ -40,4 +40,9 @@
       <para>November 13, 2005</para>
       <itemizedlist>
+        <listitem>
+          <para>[manuel] - Improve the heuristic for determining a locale that
+          is supported by both Glibc and packages outside LFS. Ported from
+          LFS-SVN.</para>
+        </listitem>
         <listitem>
           <para>[manuel] - Omit running Bzip2's testsuite as a separate step,
