diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index c803d0c07..a04bc8ac3 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 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..3640b519d 100644
--- a/chapter08/pkgmgt.xml
+++ b/chapter08/pkgmgt.xml
@@ -69,10 +69,25 @@
       </listitem>
 
       <listitem> <para>If a package containing a shared library is updated, and
-      if the name of the library changes, then any packages dynamically
+      if the name of the library<footnote><para>The name of a shared library is
+      the string coded in the <constant>DT_SONAME</constant> entry of its
+      ELF dynamic section.  You can get it with the
+      <command>readelf -d <replaceable>&lt;library file&gt;</replaceable>
+      | grep SONAME</command> command.  In most cases it's suffixed with
+      <literal>.so.<replaceable>&lt;a version
+      number&gt;</replaceable></literal>, but there are some cases where
+      it contains multiple numbers for versioning (like
+      <filename>libbz2.so.1.0</filename>), contains the version number
+      before the <filename class='extension'>.so</filename> suffix (like
+      <filename>libbfd-&binutils-version;</filename>), or does not contain
+      any version number at all (for example
+      <filename>libmemusage.so</filename>).
+      Generally there is no correlation between the package version and the
+      version number(s) in the library name.</para></footnote>
+      changes, then any packages dynamically
       linked to the library must be recompiled, to link against the
-      newer library.  (Note that there is no correlation between the package
-      version and the name of the library.) For example, consider a package
+      newer library.
+      For example, consider a package
       foo-1.2.3 that installs a shared library with the name <filename
       class='libraryfile'>libfoo.so.1</filename>. Suppose you upgrade the package to
       a newer version foo-1.2.4 that installs a shared library with the name
@@ -370,11 +385,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>
diff --git a/stylesheets/lfs-xsl/chunk-master.xsl b/stylesheets/lfs-xsl/chunk-master.xsl
index 029332162..b353e75ca 100644
--- a/stylesheets/lfs-xsl/chunk-master.xsl
+++ b/stylesheets/lfs-xsl/chunk-master.xsl
@@ -27,8 +27,12 @@
          Prevent creation of dummy sect1 files used to emulate sub-chapters.
          The original template is in {docbook-xsl}/xhtml/chunk-code.xsl
          It also matches other sect* tags. The code for those tags are
-         unchanged. -->
-  <xsl:template match="sect1">
+         unchanged. Note that the priority attribute is not strictly
+         required, because the original template is less restrictive in
+         matching, so has less precedence. But in case the docbook dev
+         add a match="sect1" template in their chunk-code.xsl, then it will
+         be necessary!-->
+  <xsl:template match="sect1" priority="1">
     <xsl:variable name="ischunk">
       <xsl:call-template name="chunk"/>
     </xsl:variable>
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl b/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
index 59859c12e..d33cd4f12 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
@@ -43,6 +43,16 @@
     </xsl:choose>
   </xsl:template>
 
+  <!-- footnote/para[1]: this template is in {docbook-xsl}/xhtml/footnote.xsl
+       which is imported. This means that template has less precedence
+       than the above one. To have higher precedence, it must be at
+       the same import level (then, since it is more restrictive, it is
+       applied preferably to the above).-->
+  <xsl:template match="footnote/para[1]">
+  <!-- just use the original template -->
+    <xsl:apply-imports/>
+  </xsl:template>
+
     <!-- screen:
            Changed class attribute asignament to fit our look needs.
            Removed unused line numbering support. -->
diff --git a/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl b/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
index b13e5e11b..0ecfaa4f6 100644
--- a/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
+++ b/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
@@ -166,7 +166,7 @@
       </xsl:choose>
       <xsl:call-template name="language.attribute"/>
       <xsl:apply-templates/>
-      <xsl:apply-templates select="sect1info" mode="svn-keys"/>
+      <xsl:call-template name="process.footnotes"/>
     </div>
   </xsl:template>