diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml
index 40af81288..f15d08b07 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>