diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 1b1dcb0c2..f83772911 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -393,7 +393,6 @@ localedef -i it_IT -f ISO-8859-1 it_IT
 localedef -i it_IT -f ISO-8859-15 it_IT@euro
 localedef -i it_IT -f UTF-8 it_IT.UTF-8
 localedef -i ja_JP -f EUC-JP ja_JP
-localedef -i ja_JP -f SHIFT_JIS ja_JP.SJIS 2> /dev/null || true
 localedef -i ja_JP -f UTF-8 ja_JP.UTF-8
 localedef -i nl_NL@euro -f ISO-8859-15 nl_NL@euro
 localedef -i ru_RU -f KOI8-R ru_RU.KOI8-R
@@ -415,15 +414,6 @@ localedef -i zh_TW -f UTF-8 zh_TW.UTF-8</userinput></screen>
 
 <screen><userinput remap="locale-full">make localedata/install-locales</userinput></screen>
 
-    <para>Then use the <command>localedef</command> command to create and
-    install locales not listed in the
-    <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file
-    when you need them. For instance, the following two locales are
-    needed for some tests later in this chapter:</para>
-
-<screen role="nodump"><userinput remap="locale-full">localedef -i C -f UTF-8 C.UTF-8
-localedef -i ja_JP -f SHIFT_JIS ja_JP.SJIS 2> /dev/null || true</userinput></screen>
-
     <note><para>Glibc now uses libidn2 when resolving internationalized
     domain names.  This is a run time dependency.  If this capability
     is needed, the instructions for installing libidn2 are in the
diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml
index ac93be476..4c113995a 100644
--- a/chapter08/libffi.xml
+++ b/chapter08/libffi.xml
@@ -51,11 +51,14 @@
       <para>Like GMP, Libffi builds with optimizations specific
       to the processor in use. If building for another system, change the
       value of the <parameter>--with-gcc-arch=</parameter> parameter in the
-      following command to an architecture name fully implemented by the
+      following command to an architecture name fully implemented by
+      <emphasis role='bold'>both</emphasis> the host CPU and the
       CPU on that system.
       If this is not done, all applications that link to
       <filename class='libraryfile'>libffi</filename> will trigger
-      Illegal Operation Errors.</para>
+      Illegal Operation Errors.  If you cannot figure out a value
+      safe for both the CPUs, replace the parameter with
+      <option>--without-gcc-arch</option> to produce a generic library.</para>
     </note>
 
     <para>Prepare Libffi for compilation:</para>
diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml
index 10ec5d199..7cda95755 100644
--- a/chapter08/pkgmgt.xml
+++ b/chapter08/pkgmgt.xml
@@ -370,11 +370,13 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
     differences in system hardware and the original kernel
     configuration.</para>
 
-    <note><para>There have been some reports of issues when copying between
-    similar but not identical architectures. For instance, the instruction set
-    for an Intel system is not identical with the AMD processor's instructions, and later
-    versions of some processors may provide instructions that are unavailable with
-    earlier versions.</para></note>
+    <important><para>If you want to deploy the LFS system onto a system
+    with a different CPU, when you build <xref linkend='ch-system-gmp'/> and
+    <xref linkend='ch-system-libffi'/> you must follow the notes about
+    overriding the architecture-specific optimization to produce libraries
+    suitable for both the host system and the system(s) where you'll deploy
+    the LFS system.  Otherwise you'll get <computeroutput>Illegal
+    Instruction</computeroutput> errors running LFS.</para></important>
 
     <para>Finally, the new system has to be made bootable via <xref
     linkend="ch-bootable-grub"/>.</para>