Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 6934b62fcfd219a322c17abf4b18a0663d4f3ed9)
+++ chapter01/changelog.xml	(revision d73074290425cf0fbe7e7ee6cb1d8c1b86a31533)
@@ -36,4 +36,26 @@
     </listitem>
 -->
+    <listitem>
+      <para>2016-04-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove obsolete note about iconv() 
+          in Chapter 6 Glibc. Minor adjustments to text in the
+          same section. Fixes
+          <ulink url="&lfs-ticket-root;3904">#3904</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add a note about UEFI and Secure Boot
+          to Chapter 8 "Using GRUB to Set Up the Boot Process". Fixes
+          <ulink url="&lfs-ticket-root;3908">#3908</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add notes about paths for 64-bit 
+          systems in Chapter 6 "Adjusting the Toolchain". Fixes
+          <ulink url="&lfs-ticket-root;3912">#3912</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2016-04-04</para>
Index: chapter06/adjusting.xml
===================================================================
--- chapter06/adjusting.xml	(revision 6934b62fcfd219a322c17abf4b18a0663d4f3ed9)
+++ chapter06/adjusting.xml	(revision d73074290425cf0fbe7e7ee6cb1d8c1b86a31533)
@@ -56,4 +56,7 @@
   the prefix of our dynamic linker.</para>
 
+  <note><para>On 64-bit systems the interpreter should be
+  /lib64/ld-linux-x86-64.so.2.</para></note>
+
   <para os="d">Now make sure that we're setup to use the correct start files:</para>
 
@@ -65,4 +68,9 @@
 /usr/lib/crti.o succeeded
 /usr/lib/crtn.o succeeded</computeroutput></screen>
+
+   <note><para>On 64-bit systems, the path above will be
+   /usr/lib/gcc/x86_64-unknown-linux-gnu/5.3.0/../../../../lib64/.  This
+   reduces to /usr/lib64 and /usr/lib64 is a symlink that points to
+   /usr/lib.</para></note>
 
   <para os="g">Verify that the compiler is searching for the correct header
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision 6934b62fcfd219a322c17abf4b18a0663d4f3ed9)
+++ chapter06/glibc.xml	(revision d73074290425cf0fbe7e7ee6cb1d8c1b86a31533)
@@ -43,5 +43,5 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
-
+<!--
     <note>
       <para>Some packages outside of LFS suggest installing GNU libiconv in
@@ -54,4 +54,11 @@
       Unicode, therefore libiconv is not required on an LFS system.</para>
     </note>
+-->
+    <note><para>The Glibc build system is self-contained and will install
+    perfectly, even though the compiler specs file and linker are still
+    pointing to <filename class="directory">/tools</filename>. The specs
+    and linker cannot be adjusted before the Glibc install because the
+    Glibc autoconf tests would give false results and defeat the goal
+    of achieving a clean build.</para></note>
 
     <para>Some of the Glibc programs use non-FHS compilant
@@ -62,24 +69,4 @@
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
 
-    <para>The Glibc build system is self-contained and will install
-    perfectly, even though the compiler specs file and linker are still
-    pointing at <filename class="directory">/tools</filename>. The specs
-    and linker cannot be adjusted before the Glibc install because the
-    Glibc autoconf tests would give false results and defeat the goal
-    of achieving a clean build.</para>
-<!--
-    <para>Now fix a build problem that affects i386 systems:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
-
-    <para>The most recent stable version of Glibc does not handle large files
-    correctly.  Fix the problem with this patch:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-largefile-patch;</userinput></screen>
-
-    <para>Finally, update some recent changes from the upstream repository:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch2;</userinput></screen>
--->
     <para>The Glibc documentation recommends building Glibc 
     in a dedicated build directory:</para>
@@ -139,25 +126,5 @@
         tests may fail for reasons that have not been determined.  </para>
       </listitem>
-<!--
-      <listitem>
-        <para>The <emphasis>elf/tst-protected1a</emphasis> and
-        <emphasis>elf/tst-protected1b</emphasis> tests are known to
-        fail with the current stable version of binutils.</para>
-      </listitem>
-
-      <listitem>
-        <para>When running on older and slower hardware or on systems under
-        load, some tests can fail because of test timeouts being exceeded.
-        Modifying the make check command to set a TIMEOUTFACTOR is reported to
-        help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
-        make -k check</command>).</para>
-      </listitem>
--->
-<!--
-      <listitem>
-        <para>libio/tst-ftell-partial-wide.out fails because it needs a locale
-        that has not yet been generated.</para>
-      </listitem>
--->
+
       <listitem>
         <para>Other tests known to fail on some architectures are
@@ -183,8 +150,8 @@
 mkdir -pv /var/cache/nscd</userinput></screen>
 
-    <para>The locales that can make the system respond in a different language
-    were not installed by the above command. None of the locales are required,
-    but if some of them are missing, test suites of the future packages would
-    skip important testcases.</para>
+    <para>Next, install the locales that can make the system respond in a
+    different language.  None of the locales are required, but if some of them
+    are missing, the test suites of future packages would skip important
+    testcases.</para>
 
     <para>Individual locales can be installed using the
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision 6934b62fcfd219a322c17abf4b18a0663d4f3ed9)
+++ chapter08/grub.xml	(revision d73074290425cf0fbe7e7ee6cb1d8c1b86a31533)
@@ -38,4 +38,14 @@
 grub-mkrescue --output=grub-img.iso 
 xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></screen>
+
+    <note><para>Most newer systems now come with system firmware that is in
+    UEFI ((Unified Extensible Firmware Interface) mode by default.  To boot LFS
+    on these systems using the instructions here, the UEFI Mode and Secure Boot
+    capabilities need to be turned off.  There are ways to boot with these
+    capabilities still enabled, but are not covered here.  For details, see
+    <ulink
+    url="http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt">the
+    lfs-uefi.txt hint</ulink> at
+    http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt.</para></note>
 
   </sect2>
