Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision 1b11115cd2bde70178f0b600de85f64a12cc36dc)
+++ chapter05/gcc-pass1.xml	(revision 0d8c2d6ab0392214f03a17c83d4678e1f08629e3)
@@ -63,13 +63,11 @@
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>On x86_64 hosts, set the default directory name for
-    64-bit libraries to <quote>lib</quote>:</para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-  x86_64)
-    sed -e '/m64=/s/lib64/lib/' \
-        -i.orig gcc/config/i386/t-linux64
- ;;
-esac</userinput></screen>
+    <para>For x86_64 target, set the default directory name for
+    64-bit libraries to <quote>lib</quote>.  The command is unnecessary,
+    but harmless for 32-bit x86.  If you are building for another target,
+    you may need to adjust the command for your target.</para>
+
+<screen><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+    -i.orig gcc/config/i386/t-linux64</userinput></screen>
 
     <para>The GCC documentation recommends building GCC
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision 1b11115cd2bde70178f0b600de85f64a12cc36dc)
+++ chapter05/glibc.xml	(revision 0d8c2d6ab0392214f03a17c83d4678e1f08629e3)
@@ -46,11 +46,13 @@
     <para>First, create a symbolic link for LSB compliance. Additionally,
     for x86_64, create a compatibility symbolic link required for proper
-    operation of the dynamic library loader:</para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-    i?86)   ln -sfv ld-linux.so.2 $LFS/lib/ld-lsb.so.3
+    operation of the dynamic library loader.  It's needed to adjust the
+    command if you are building LFS for a target other than 32-bit or
+    64-bit x86.</para>
+
+<screen><userinput remap="pre">case $LFS_TGT in
+    i?86*)   ln -sfv ld-linux.so.2 $LFS/lib/ld-lsb.so.3
     ;;
-    x86_64) ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
-            ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3
+    x86_64*) ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
+             ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3
     ;;
 esac</userinput></screen>
@@ -90,5 +92,5 @@
       --host=$LFS_TGT                    \
       --build=$(../scripts/config.guess) \
-      --enable-kernel=&min-kernel;                \
+      --enable-kernel=&linux-major-version;.&linux-minor-version;               \
       --with-headers=$LFS/usr/include    \
       libc_cv_slibdir=/usr/lib</userinput></screen>
@@ -107,9 +109,11 @@
 
       <varlistentry>
-        <term><parameter>--enable-kernel=&min-kernel;</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile the library with support
-          for &min-kernel; and later Linux kernels.  Workarounds for older
-          kernels are not enabled.</para>
+        <term><parameter>--enable-kernel=&linux-major-version;.&linux-minor-version;</parameter></term>
+        <listitem>
+          <para>This option tells the build system that this glibc may
+          be used with kernels as old as
+          &linux-major-version;.&linux-minor-version;. This means generating
+          workarounds in case a system call introduced in a later version
+          cannot be used.</para>
         </listitem>
       </varlistentry>
Index: chapter05/linux-headers.xml
===================================================================
--- chapter05/linux-headers.xml	(revision 1b11115cd2bde70178f0b600de85f64a12cc36dc)
+++ chapter05/linux-headers.xml	(revision 0d8c2d6ab0392214f03a17c83d4678e1f08629e3)
@@ -57,7 +57,8 @@
     be available. The headers are first placed in
     <filename class="directory">./usr</filename>, then copied to the needed
-    location.</para>
-
-<screen><userinput remap="make">make headers
+    location.  Replace <replaceable>x86</replaceable> with a value suitable
+    for your target machine if it's not a 32-bit or 64-bit x86:</para>
+
+<screen><userinput remap="make">make headers ARCH=<replaceable>x86</replaceable>
 find usr/include -name '.*' -delete
 rm usr/include/Makefile
