Index: Makefile
===================================================================
--- Makefile	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ Makefile	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -39,6 +39,10 @@
 endif
 ifneq ($(ARCH), default)
-  ifneq ($(ARCH), multilib)
-    $(error ARCH must be either 'default' (default if unset) or 'multilib'.)
+  ifneq ($(ARCH), ml_32)
+    ifneq ($(ARCH), ml_x32)
+      ifneq ($(ARCH), ml_all)
+        $(error ARCH must be either 'default' (default if unset), 'ml_32', 'ml_x32' or 'ml_all'.)
+      endif
+    endif
   endif
 endif
Index: chapter01/askforhelp.xml
===================================================================
--- chapter01/askforhelp.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter01/askforhelp.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -40,8 +40,8 @@
       <listitem>
         <para>The version of the book being used (in this case 
-              <phrase arch="default" revision="sysv">&version;</phrase>
-              <phrase arch="multilib" revision="sysv">&version;-multilib</phrase>
+          <phrase arch="default" revision="sysv">&version;</phrase>
+          <phrase arch="ml_32,ml_x32,ml_all" revision="sysv">&version;-multilib</phrase>
           <phrase arch="default" revision="systemd">&versiond;</phrase>
-          <phrase arch="multilib" revision="systemd">&versiond;-multilib</phrase>)</para>
+          <phrase arch="ml_32,ml_x32,ml_all" revision="systemd">&versiond;-multilib</phrase>)</para>
 
       </listitem>
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter01/changelog.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -13,7 +13,7 @@
   <para>This is version 
         <phrase arch="default" revision="sysv">&version;</phrase>
-        <phrase arch="multilib" revision="sysv">&version;-multilib</phrase>
+        <phrase arch="ml_32,ml_x32,ml_all" revision="sysv">&version;-multilib</phrase>
         <phrase arch="default" revision="systemd">&versiond;</phrase>
-        <phrase arch="multilib" revision="systemd">&versiond;-multilib</phrase> 
+        <phrase arch="ml_32,ml_x32,ml_all" revision="systemd">&versiond;-multilib</phrase> 
   of the Linux From Scratch book, dated
   &releasedate;. If this book is more than six months old, a newer and better
Index: chapter04/settingenviron.xml
===================================================================
--- chapter04/settingenviron.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter04/settingenviron.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -48,5 +48,5 @@
 EOF</userinput></screen>
 
-<screen arch="multilib"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
+<screen arch="ml_32,ml_x32,ml_all"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
 <literal>set +h
 umask 022
Index: chapter05/binutils-pass1.xml
===================================================================
--- chapter05/binutils-pass1.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/binutils-pass1.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -80,7 +80,10 @@
              --disable-werror</userinput></screen>
 
-    <screen arch="multilib"><userinput remap="configure">../configure --prefix=/tools \
+    <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">lpath=/tools/lib</userinput>
+<userinput remap="configure" arch="ml_32,ml_all">lpath="$lpath:/tools/lib32"</userinput>
+<userinput remap="configure" arch="ml_x32,ml_all">lpath="$lpath:/tools/libx32"</userinput>
+<userinput remap="configure">../configure --prefix=/tools \
              --with-sysroot=$LFS                     \
-             --with-lib-path=/tools/lib:/tools/lib32:/tools/libx32 \
+             --with-lib-path=$lpath                  \
              --target=$LFS_TGT                       \
              --disable-nls                           \
@@ -159,5 +162,5 @@
     sanity of the toolchain:</para>
 
-    <para arch="multilib">Create a symlink to ensure the sanity of
+    <para arch="ml_32,ml_x32,ml_all">Create a symlink to ensure the sanity of
     the toolchain:</para>
 
@@ -166,5 +169,5 @@
 esac</userinput></screen>
 
-<screen arch="multilib"><userinput remap="install">mkdir -v /tools/lib &amp;&amp;
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="install">mkdir -v /tools/lib &amp;&amp;
 ln -sv lib /tools/lib64</userinput></screen>
 
Index: chapter05/binutils-pass2.xml
===================================================================
--- chapter05/binutils-pass2.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/binutils-pass2.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -61,5 +61,8 @@
     --with-sysroot</userinput></screen>
 
-<screen arch="multilib"><userinput remap="configure">CC=$LFS_TGT-gcc                \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">lpath=/tools/lib</userinput>
+<userinput remap="configure" arch="ml_32,ml_all">lpath="$lpath:/tools/lib32"</userinput>
+<userinput remap="configure" arch="ml_x32,ml_all">lpath="$lpath:/tools/libx32"</userinput>
+<userinput remap="configure">CC=$LFS_TGT-gcc                \
 AR=$LFS_TGT-ar                 \
 RANLIB=$LFS_TGT-ranlib         \
@@ -68,5 +71,5 @@
     --disable-nls              \
     --disable-werror           \
-    --with-lib-path=/tools/lib:/tools/lib32:/tools/libx32 \
+    --with-lib-path=$lpath     \
     --with-sysroot             \
     --enable-64-bit-bfd        \
@@ -96,5 +99,5 @@
       </varlistentry>
 
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--with-lib-path=/tools/lib:...</parameter></term>
         <listitem>
@@ -119,5 +122,5 @@
       </varlistentry>
 
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--enable-64-bit-bfd</parameter></term>
         <listitem>
@@ -126,5 +129,5 @@
       </varlistentry>
       
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--enable-multilib</parameter></term>
         <listitem>
@@ -150,6 +153,12 @@
 cp -v ld/ld-new /tools/bin</userinput></screen>
 
-<screen arch="multilib"><userinput remap="adjust">make -C ld clean
+<screen arch="ml_all"><userinput remap="adjust">make -C ld clean
 make -C ld LIB_PATH=/usr/lib:/lib:/usr/lib32:/lib32:/usr/libx32:/libx32
+cp -v ld/ld-new /tools/bin</userinput></screen>
+<screen arch="ml_32"><userinput remap="adjust">make -C ld clean
+make -C ld LIB_PATH=/usr/lib:/lib:/usr/lib32:/lib32
+cp -v ld/ld-new /tools/bin</userinput></screen>
+<screen arch="ml_x32"><userinput remap="adjust">make -C ld clean
+make -C ld LIB_PATH=/usr/lib:/lib:/usr/libx32:/libx32
 cp -v ld/ld-new /tools/bin</userinput></screen>
 
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/gcc-pass1.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -50,5 +50,5 @@
     automatically use them:</para>
 
-    <para arch="multilib">GCC now requires the GMP, ISL, MPFR, and MPC packages.
+    <para arch="ml_32,ml_x32,ml_all">GCC now requires the GMP, ISL, MPFR, and MPC packages.
     As these packages may not be included in your host distribution, they will
     be built with GCC.  Unpack each package into the GCC source directory and 
@@ -68,5 +68,5 @@
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
-<screen arch="multilib"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
 mv -v mpfr-&mpfr-version; mpfr
 tar -xf ../gmp-&gmp-version;.tar.xz
@@ -122,5 +122,5 @@
 esac</userinput></screen>
 
-<screen arch="multilib"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
     -i.orig gcc/config/i386/t-linux64
 cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
@@ -150,7 +150,7 @@
     <!-- see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86724 -->
     <!-- Fix applied in ch5-gcc-pass{1,2}, ch6-gcc -->
-    <para arch="multilib">Fix an issue with isl-&isl-version;:</para>
-
-<screen arch="multilib"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
+    <para arch="ml_32,ml_x32,ml_all">Fix an issue with isl-&isl-version;:</para>
+
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
     -i gcc/graphite.h</userinput></screen>
 
@@ -186,5 +186,8 @@
     --enable-languages=c,c++</userinput></screen>
 
-<screen arch="multilib"><userinput remap="configure">../configure                                       \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">mlist="m64"</userinput>
+<userinput arch="ml_32,ml_all" remap="configure">mlist="$mlist,m32"</userinput>
+<userinput arch="ml_x32,ml_all" remap="configure">mlist="$mlist,mx32"</userinput>
+<userinput remap="configure">../configure                                       \
     --target=$LFS_TGT                              \
     --prefix=/tools                                \
@@ -198,5 +201,5 @@
     --disable-shared                               \
     --enable-multilib                              \
-    --with-multilib-list=m32,m64,mx32              \
+    --with-multilib-list=$mlist                    \
     --disable-decimal-float                        \
     --disable-threads                              \
@@ -287,5 +290,5 @@
       </varlistentry>
 
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--enable-multilib,
                          --with-multilib-list=m32,m64,mx32</parameter></term>
Index: chapter05/gcc-pass2.xml
===================================================================
--- chapter05/gcc-pass2.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/gcc-pass2.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -94,8 +94,8 @@
 esac</userinput></screen>
 
-    <para arch="multilib">Change the default directory name for 64-bit
+    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 
-<screen arch="multilib"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
     -i.orig gcc/config/i386/t-linux64
 cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
@@ -112,5 +112,5 @@
     required directory names:</para>
 
-    <para arch="multilib">As in the first build of GCC it requires the GMP,
+    <para arch="ml_32,ml_x32,ml_all">As in the first build of GCC it requires the GMP,
     ISL, MPFR, and MPC packages. Unpack the tarballs and move them into the
     required directory names:</para>
@@ -122,5 +122,5 @@
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
-<screen arch="multilib"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
 mv -v mpfr-&mpfr-version; mpfr
 tar -xf ../gmp-&gmp-version;.tar.xz
@@ -132,7 +132,7 @@
 
     <!-- Following patch might be obsolete with gcc >= 8.2.1 --> 
-    <para arch="multilib">Fix an issue with isl-&isl-version;:</para>
-
-<screen arch="multilib"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
+    <para arch="ml_32,ml_x32,ml_all">Fix an issue with isl-&isl-version;:</para>
+
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
     -i gcc/graphite.h</userinput></screen>
 
@@ -161,5 +161,8 @@
     --disable-libgomp</userinput></screen>
 
-<screen arch="multilib"><userinput remap="configure">CC=$LFS_TGT-gcc                                    \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">mlist="m64"</userinput>
+<userinput arch="ml_32,ml_all" remap="configure">mlist="$mlist,m32"</userinput>
+<userinput arch="ml_x32,ml_all" remap="configure">mlist="$mlist,mx32"</userinput>
+<userinput remap="configure">CC=$LFS_TGT-gcc                                    \
 CXX=$LFS_TGT-g++                                   \
 AR=$LFS_TGT-ar                                     \
@@ -172,5 +175,5 @@
     --disable-libstdcxx-pch                        \
     --enable-multilib                              \
-    --with-multilib-list=m32,m64,mx32              \
+    --with-multilib-list=$mlist                    \
     --with-system-zlib                             \
     --disable-bootstrap                            \
@@ -245,21 +248,21 @@
 
 
-    <para arch="multilib">Repeat the test for 32-bit:</para>
-
-<screen arch="multilib"><userinput>cc -m32 dummy.c
+    <para arch="ml_32,ml_all">Repeat the test for 32-bit:</para>
+
+<screen arch="ml_32,ml_all"><userinput>cc -m32 dummy.c
 readelf -l a.out | grep ': /tools'</userinput></screen>
 
-    <para arch="multilib">In this case, the output shoud be:</para>
-
-<screen arch="multilib"><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
-
-    <para arch="multilib">Repeat the test for x32-bit:</para>
-
-<screen arch="multilib"><userinput>cc -mx32 dummy.c
+    <para arch="ml_32,ml_all">In this case, the output shoud be:</para>
+
+<screen arch="ml_32,ml_all"><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
+
+    <para arch="ml_x32,ml_all">Repeat the test for x32-bit:</para>
+
+<screen arch="ml_x32,ml_all"><userinput>cc -mx32 dummy.c
 readelf -l a.out | grep ': /tools'</userinput></screen>
 
-    <para arch="multilib">In this case, the output shoud be:</para>
-
-<screen arch="multilib"><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux-x32.so.2]</computeroutput></screen>
+    <para arch="ml_x32,ml_all">In this case, the output shoud be:</para>
+
+<screen arch="ml_x32,ml_all"><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux-x32.so.2]</computeroutput></screen>
 
     <para arch="default">Note that the dynamic linker will be
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/glibc.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -83,5 +83,5 @@
       </varlistentry>
 
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--enable-multi-arch</parameter></term>
         <listitem>
@@ -192,5 +192,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Glibc 32-bit</title>
 
@@ -214,7 +214,8 @@
              --libexecdir=/tools/lib32          \
              --with-headers=/tools/include      \
-             --with-binutils=/tools/bin         \
+             --with-binutils=/tools/bin</userinput></screen>
+<!--                      \
              libc_cv_forced_unwind=yes          \
-             libc_cv_c_cleanup=yes</userinput></screen>
+             libc_cv_c_cleanup=yes</userinput></screen> -->
 
     <para>Now compile the 32-bit version of glibc:</para>
@@ -232,5 +233,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Glibc x32-bit</title>
 
@@ -254,7 +255,8 @@
              --libexecdir=/tools/libx32         \
              --with-headers=/tools/include      \
-             --with-binutils=/tools/bin         \
+             --with-binutils=/tools/bin</userinput></screen>
+<!--                      \
              libc_cv_forced_unwind=yes          \
-             libc_cv_c_cleanup=yes</userinput></screen>
+             libc_cv_c_cleanup=yes</userinput></screen> -->
 
     <para>Now compile the x32-bit version of glibc:</para>
Index: chapter05/ncurses.xml
===================================================================
--- chapter05/ncurses.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/ncurses.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -113,5 +113,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Ncurses - 32 bit</title>
 
@@ -144,5 +144,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Ncurses - x32 bit</title>
 
Index: chapter05/stripping.xml
===================================================================
--- chapter05/stripping.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/stripping.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -19,5 +19,9 @@
 /usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
 
-<screen arch="multilib"><userinput>strip --strip-debug /tools/lib{,{,x}32}/*
+<screen arch="ml_32"><userinput>strip --strip-debug /tools/lib{,32}/*
+/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
+<screen arch="ml_x32"><userinput>strip --strip-debug /tools/lib{,x32}/*
+/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
+<screen arch="ml_all"><userinput>strip --strip-debug /tools/lib{,{,x}32}/*
 /usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
 
@@ -39,5 +43,7 @@
 <screen arch="default"><userinput>find /tools/{lib,libexec} -name \*.la -delete</userinput></screen>
 
-<screen arch="multilib"><userinput>find /tools/{lib{,{,x}32},libexec} -name \*.la -delete</userinput></screen>
+<screen arch="ml_32"><userinput>find /tools/{lib{,32},libexec} -name \*.la -delete</userinput></screen>
+<screen arch="ml_x32"><userinput>find /tools/{lib{,x32},libexec} -name \*.la -delete</userinput></screen>
+<screen arch="ml_all"><userinput>find /tools/{lib{,{,x}32},libexec} -name \*.la -delete</userinput></screen>
 
   <para>At this point, you should have at least 3 GB of free space in
Index: chapter05/util-linux.xml
===================================================================
--- chapter05/util-linux.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/util-linux.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -122,5 +122,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Util-Linux - 32 bit</title>
 
@@ -154,5 +154,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Util-Linux - x32 bit</title>
 
Index: chapter05/xz.xml
===================================================================
--- chapter05/xz.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/xz.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -64,5 +64,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Xz - 32 bit</title>
 
@@ -91,5 +91,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Xz - x32 bit</title>
 
Index: chapter05/zlib.xml
===================================================================
--- chapter05/zlib.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter05/zlib.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 arch="multilib" id="ch-tools-zlib" role="wrap">
+<sect1 arch="ml_32,ml_x32,ml_all" id="ch-tools-zlib" role="wrap">
   <?dbhtml filename="zlib.html"?>
 
@@ -60,5 +60,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Zlib - 32 bit</title>
 
@@ -83,5 +83,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Zlib - x32 bit</title>
 
Index: chapter06/acl.xml
===================================================================
--- chapter06/acl.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/acl.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -80,5 +80,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Acl - 32-bit</title>
 
@@ -106,5 +108,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Acl - x32-bit</title>
 
Index: chapter06/attr.xml
===================================================================
--- chapter06/attr.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/attr.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -79,5 +79,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Attr - 32-bit</title>
 
@@ -106,5 +108,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Attr - x32-bit</title>
 
Index: chapter06/bzip2.xml
===================================================================
--- chapter06/bzip2.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/bzip2.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -98,5 +98,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Bzip2 - 32-bit</title>
 
@@ -122,5 +124,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Bzip2 - x32-bit</title>
 
Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/chapter06.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -23,5 +23,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="adjusting.xml"/>
 
-  <!-- arch="multilib" only -->
+  <!-- arch="ml_32,ml_x32,ml_all" only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc-32.xml"/>
 
Index: chapter06/createfiles.xml
===================================================================
--- chapter06/createfiles.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/createfiles.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -48,13 +48,12 @@
 
 ln -sv bash /bin/sh</userinput></screen>
-<screen arch="multilib"><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,ln,mkdir,pwd,rm,stty,touch} /bin
+<screen arch="ml_32,ml_x32,ml_all"><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,ln,mkdir,pwd,rm,stty,touch} /bin
 ln -sv /tools/bin/{env,install,perl,printf}         /usr/bin
-for lib in lib{,32,x32}; do
+for lib in lib{</userinput><userinput arch="ml_32,ml_all">,32</userinput><userinput arch="ml_x32,ml_all">,x32</userinput><userinput>}; do
   ln -sv /tools/$lib/libgcc_s.so{,.1}               /usr/$lib
   ln -sv /tools/$lib/libstdc++.{a,so{,.6}}          /usr/$lib
 done
-ln -sv /usr/libx32 /
-
-install -vdm755 /usr/lib{,32,x32}/pkgconfig
+</userinput><userinput arch="ml_x32,ml_all">ln -sv /usr/libx32 /</userinput><userinput>
+install -vdm755 /usr/lib{</userinput><userinput arch="ml_32,ml_all">,32</userinput><userinput arch="ml_x32,ml_all">,x32</userinput><userinput>}/pkgconfig
 
 ln -sv bash /bin/sh</userinput></screen>
Index: chapter06/creatingdirs.xml
===================================================================
--- chapter06/creatingdirs.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/creatingdirs.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -32,5 +32,5 @@
 ln -sv /run/lock /var/lock
 mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput></screen>
-<screen arch="multilib"><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig,ld.so.conf.d},home,lib/firmware,mnt,opt}
+<screen arch="ml_32,ml_x32,ml_all"><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig,ld.so.conf.d},home,lib/firmware,mnt,opt}
 mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
 install -dv -m 0750 /root
@@ -45,6 +45,7 @@
 ln -sv /run /var/run
 ln -sv /run/lock /var/lock
-mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}
-mkdir -pv /usr/lib{,x}32</userinput></screen>
+mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput>
+<userinput arch="ml_32,ml_all">mkdir -pv /usr/lib32</userinput>
+<userinput arch="ml_x32,ml_all">mkdir -pv /usr/libx32</userinput></screen>
 
   <para>Directories are, by default, created with permission mode 755, but
Index: chapter06/eudev.xml
===================================================================
--- chapter06/eudev.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/eudev.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -107,5 +107,5 @@
   <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
   
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Eudev - 32-bit</title>
 
@@ -144,5 +144,5 @@
   <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
   
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Eudev - x32-bit</title>
 
Index: chapter06/expat.xml
===================================================================
--- chapter06/expat.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/expat.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -70,5 +70,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Expat - 32-bit</title>
 
@@ -98,5 +100,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Zlib - x32-bit</title>
 
Index: chapter06/file.xml
===================================================================
--- chapter06/file.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/file.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -60,5 +60,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of File - 32-bit</title>
 
@@ -86,5 +88,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of File - x32-bit</title>
 
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/gcc.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -52,8 +52,8 @@
 esac</userinput></screen>
 
-    <para arch="multilib">Change the default directory name for 64-bit
+    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 
-<screen arch="multilib"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
     -i.orig gcc/config/i386/t-linux64
 cat &gt; gcc/config/i386/t-linux64 &lt;&lt;"EOF"
@@ -91,11 +91,27 @@
              --disable-libmpx         \
              --with-system-zlib</userinput></screen>
-
-<screen arch="multilib"><userinput remap="configure">SED=sed                               \
+<screen arch="ml_32"><userinput remap="configure">SED=sed                               \
 ../configure --prefix=/usr                     \
              --enable-languages=c,c++          \
              --enable-multilib                 \
-             --with-multilib-list=m32,m64,mx32 \
+             --with-multilib-list=m32,m64      \
              --disable-bootstrap               \
+             --disable-libmpx                  \
+             --with-system-zlib</userinput></screen>
+<screen arch="ml_x32"><userinput remap="configure">SED=sed                               \
+../configure --prefix=/usr                     \
+             --enable-languages=c,c++          \
+             --enable-multilib                 \
+             --with-multilib-list=mx32,m64     \
+             --disable-bootstrap               \
+             --disable-libmpx                  \
+             --with-system-zlib</userinput></screen>
+<screen arch="ml_all"><userinput remap="configure">SED=sed                               \
+../configure --prefix=/usr                     \
+             --enable-languages=c,c++          \
+             --enable-multilib                 \
+             --with-multilib-list=m32,mx32,m64 \
+             --disable-bootstrap               \
+             --disable-libmpx                  \
              --with-system-zlib</userinput></screen>
 
Index: chapter06/glibc-32.xml
===================================================================
--- chapter06/glibc-32.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/glibc-32.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 arch="multilib" id="ch-system-glibc-32" role="wrap">
+<sect1 arch="ml_32,ml_x32,ml_all" id="ch-system-glibc-32" role="wrap">
   <?dbhtml filename="glibc-32.html"?>
 
@@ -41,5 +41,8 @@
   </sect2>
 -->
-  <sect2 role="installation">
+
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Glibc - 32-bit</title>
 
@@ -98,5 +101,7 @@
   </sect2>
 
-  <sect2>
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Glibc - x32-bit</title>
 
Index: chapter06/gmp.xml
===================================================================
--- chapter06/gmp.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/gmp.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -122,5 +122,5 @@
 
   <!-- ~~~~~ m32 ~~~~~ -->
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of GMP - 32-bit</title>
 
@@ -173,6 +173,6 @@
   </sect2>
   
-  <!-- ~~~~~ m32 ~~~~~ -->
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~ mx32 ~~~~~ -->
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of GMP - x32-bit</title>
 
Index: chapter06/kmod.xml
===================================================================
--- chapter06/kmod.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/kmod.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -98,5 +98,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Kmod - 32-bit</title>
 
@@ -130,5 +132,7 @@
   </sect2>
 
-<sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Kmod - x32-bit</title>
 
Index: chapter06/libcap.xml
===================================================================
--- chapter06/libcap.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/libcap.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -93,5 +93,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Libcap - 32-bit</title>
 
@@ -112,5 +112,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Libcap - x32-bit</title>
 
Index: chapter06/libelf.xml
===================================================================
--- chapter06/libelf.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/libelf.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -64,5 +64,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Libelf - 32-bit</title>
 
@@ -91,5 +91,5 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Libelf - x32-bit</title>
 
Index: chapter06/libffi.xml
===================================================================
--- chapter06/libffi.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/libffi.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -99,6 +99,7 @@
   </sect2>
 
-  <!-- ~~~~~ m32 ~~~~~ -->
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Libffi - 32-bit</title>
 
@@ -133,6 +134,7 @@
   </sect2>
 
-  <!-- ~~~~~ mx32 ~~~~~ -->
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Libffi - x32-bit</title>
 
Index: chapter06/libtool.xml
===================================================================
--- chapter06/libtool.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/libtool.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -71,6 +71,7 @@
   </sect2>
 
-
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Libtool - 32-bit</title>
 
@@ -98,5 +99,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Libtool - x32-bit</title>
 
Index: chapter06/ncurses.xml
===================================================================
--- chapter06/ncurses.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/ncurses.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -55,5 +55,5 @@
             --enable-pc-files       \
             --enable-widec</userinput></screen>
-<screen arch="multilib"><userinput remap="configure">./configure --prefix=/usr           \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">./configure --prefix=/usr           \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -97,5 +97,5 @@
       </varlistentry>
 
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--with-pkg-config-libdir=/usr/lib/pkgconfig</parameter></term>
         <listitem>
@@ -179,5 +179,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Ncurses - 32-bit</title>
 
@@ -234,5 +236,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Ncurses - x32-bit</title>
 
Index: chapter06/openssl.xml
===================================================================
--- chapter06/openssl.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/openssl.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -75,6 +75,7 @@
   </sect2>
 
-  <!-- ~~~~~ 32-bit ~~~~~ -->
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of OpenSSL - 32-bit</title>
 
@@ -107,6 +108,7 @@
   </sect2>
 
-  <!-- ~~~~~ x32-bit ~~~~~ -->
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of OpenSSL - x32-bit</title>
 
Index: chapter06/readline.xml
===================================================================
--- chapter06/readline.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/readline.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -93,5 +93,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Readline - 32-bit</title>
 
@@ -120,5 +122,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Readline - x32-bit</title>
 
Index: chapter06/revisedchroot.xml
===================================================================
--- chapter06/revisedchroot.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/revisedchroot.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -63,7 +63,8 @@
   at this point. To remove them, run:</para>
 
-<screen arch="default"><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
-
-<screen arch="multilib"><userinput>find /usr/lib{,{,x}32} /usr/libexec -name \*.la -delete</userinput></screen>
+  <screen arch="default"><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
+ <screen arch="ml_32"><userinput>find /usr/lib{,32} /usr/libexec -name \*.la -delete</userinput></screen>
+<screen arch="ml_x32"><userinput>find /usr/lib{,x32} /usr/libexec -name \*.la -delete</userinput></screen>
+ <screen arch="ml_all"><userinput>find /usr/lib{,{,x}32} /usr/libexec -name \*.la -delete</userinput></screen>
 
    <para>For more information about libtool archive files, see the <ulink
Index: chapter06/strippingagain.xml
===================================================================
--- chapter06/strippingagain.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/strippingagain.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -57,5 +57,5 @@
 unset LIB save_lib save_usrlib</userinput></screen>
 
-<screen arch="multilib"><userinput>save_lib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so"
+<screen arch="ml_32,ml_x32,ml_all"><userinput>save_lib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so"
 
 cd /lib
@@ -114,5 +114,5 @@
     -exec /tools/bin/strip --strip-all {} ';'</userinput></screen>
 
-<screen arch="multilib"><userinput>/tools/bin/find /usr/lib{,{,x}32} -type f -name \*.a \
+<screen arch="ml_32,ml_x32,ml_all"><userinput>/tools/bin/find /usr/lib{,{,x}32} -type f -name \*.a \
    -exec /tools/bin/strip --strip-debug {} ';'
 
Index: chapter06/systemd.xml
===================================================================
--- chapter06/systemd.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/systemd.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -213,5 +213,5 @@
 <!-- ====== 32-bit ===== -->
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of systemd - 32-bit</title>
 
@@ -281,5 +281,5 @@
 <!-- ====== x32-bit ===== -->
 
-  <sect2 arch="multilib" role="installation">
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of systemd - x32-bit</title>
 
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/util-linux.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -53,5 +53,4 @@
   </sect2>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~ default ABI ~~~~~~~~~~~~~~~~~~~~~ -->
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
@@ -123,6 +122,7 @@
   </sect2>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~ ABI 32-bit ~~~~~~~~~~~~~~~~~~~~~ -->
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Util-linux - 32-bit</title>
 
@@ -179,6 +179,7 @@
   </sect2>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~ ABI x32-bit ~~~~~~~~~~~~~~~~~~~~~ -->
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Util-linux - x32-bit</title>
 
Index: chapter06/xz.xml
===================================================================
--- chapter06/xz.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/xz.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -69,5 +69,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Xz - 32-bit</title>
 
@@ -96,5 +98,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Xz - x32-bit</title>
 
Index: chapter06/zlib.xml
===================================================================
--- chapter06/zlib.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter06/zlib.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -68,5 +68,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_32,ml_all" role="installation">
     <title>Installation of Zlib - 32-bit</title>
 
@@ -94,5 +96,7 @@
   </sect2>
 
-  <sect2 arch="multilib" role="installation">
+  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  
+  <sect2 arch="ml_x32,ml_all" role="installation">
     <title>Installation of Zlib - x32-bit</title>
 
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter08/grub.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -166,5 +166,5 @@
 EOF</userinput></screen>
 
-    <screen arch="multilib" revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
+    <screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
 <literal># Begin /boot/grub/grub.cfg
 set default=0
@@ -179,5 +179,5 @@
 EOF</userinput></screen>
 
-    <screen arch="multilib" revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
+    <screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
 <literal># Begin /boot/grub/grub.cfg
 set default=0
Index: chapter08/kernel.xml
===================================================================
--- chapter08/kernel.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter08/kernel.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -238,9 +238,9 @@
 <screen arch="default" revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
 
-<screen arch="multilib" revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;-multilib</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;-multilib</userinput></screen>
 
 <screen arch="default" revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
 
-<screen arch="multilib" revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;-multilib</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;-multilib</userinput></screen>
 
 
@@ -354,6 +354,6 @@
         <phrase arch="default" revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
         <phrase arch="default" revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
-        <phrase arch="multilib" revision="sysv">vmlinuz-&linux-version;-lfs-&version;-multilib,</phrase>
-        <phrase arch="multilib" revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;-multilib,</phrase>
+        <phrase arch="ml_32,ml_x32,ml_all" revision="sysv">vmlinuz-&linux-version;-lfs-&version;-multilib,</phrase>
+        <phrase arch="ml_32,ml_x32,ml_all" revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;-multilib,</phrase>
         and System.map-&linux-version;</seg>
         <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
Index: chapter09/theend.xml
===================================================================
--- chapter09/theend.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ chapter09/theend.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -37,5 +37,5 @@
 EOF</userinput></screen>
 
-<screen arch="multilib" revision="systemd"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
+<screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
 NAME="Linux From Scratch"
 VERSION="&versiond;"
@@ -52,5 +52,5 @@
 
 <screen arch="default" revision="sysv"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
-<screen arch="multilib" revision="sysv"><userinput>echo &version;-multilib &gt; /etc/lfs-release</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput>echo &version;-multilib &gt; /etc/lfs-release</userinput></screen>
 
   <para revision="systemd">Creating the file
@@ -80,5 +80,5 @@
 EOF</userinput></screen>
 
-<screen arch="multilib" revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
+<screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
 DISTRIB_ID="Linux From Scratch"
 DISTRIB_RELEASE="&version;-multilib"
@@ -87,5 +87,5 @@
 EOF</userinput></screen>
 
-<screen arch="multilib" revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
+<screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
 DISTRIB_ID="Linux From Scratch"
 DISTRIB_RELEASE="&versiond;-multilib"
Index: prologue/bookinfo.xml
===================================================================
--- prologue/bookinfo.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ prologue/bookinfo.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -10,6 +10,6 @@
   <subtitle arch="default" revision='sysv'>Version &version;</subtitle>
   <subtitle arch="default" revision='systemd'>Version &versiond;</subtitle>
-  <subtitle arch="multilib" revision='sysv'>Version &version;-multilib</subtitle>
-  <subtitle arch="multilib" revision='systemd'>Version &versiond;-multilib</subtitle>
+  <subtitle arch="ml_32,ml_x32,ml_all" revision='sysv'>Version &version;-multilib</subtitle>
+  <subtitle arch="ml_32,ml_x32,ml_all" revision='systemd'>Version &versiond;-multilib</subtitle>
 
   <authorgroup>
@@ -33,5 +33,5 @@
     </author>
 
-    <author arch="multilib">
+    <author arch="ml_32,ml_x32,ml_all">
       <firstname>Editor: Thomas</firstname>
       <surname>Trepl</surname>
Index: prologue/multilib.xml
===================================================================
--- prologue/multilib.xml	(revision 6702623889383cb0400fb0d5f87bb68866d7141c)
+++ prologue/multilib.xml	(revision fd48baafd54bd45a4c118a52433a6ec7b89e4876)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 arch="multilib" id="pre-multilib">
+<sect1 arch="ml_32,ml_x32,ml_all" id="pre-multilib">
   <?dbhtml filename="multilib.html"?>
 
   <title>About the Multilib Edition</title>
 
-  <sect2><title>What is 'multilib'</title>
+  <sect2><title>What is Multilib</title>
 
     <para>Today, most systems in the x86 world have a word size of 64 
@@ -29,5 +29,5 @@
   </sect2>
 
-  <sect2><title>Why doing multilib?</title>
+  <sect2><title>Why doing Multilib?</title>
 
     <para>From a educational point of view, LFS in its 'native' form is
@@ -55,5 +55,5 @@
     </para>
 
-    <para>This multilib edition of LFS goes a small step beyond and a 
+    <para>The multilib edition of LFS goes a small step beyond and a 
       small step back to what has been said in the previous section 
       when talking about target architectures. On one hand, the multilib 
@@ -72,14 +72,14 @@
   </sect2>
 
-  <sect2><title>Building a multilib system</title>
+  <sect2><title>Building a Multilib System</title>
 
     <para>Building a multilib system is not that much different from 
       building a system by using the 'native' LFS book. Beside some 
       tweaks here and there the most prominent difference is that 
-      multilib requires compiling many applications three times:
+      multilib requires compiling some applications up to three times:
       one for the primary 64-bit architecture,
-      one for the minor 32-bit architecture (m32),
-      and once again for the 32-bit architecture with 64-bit memory 
-      extensions (mx32).</para>
+      one for the 32-bit architecture (m32),
+      and once again for the 32-bit architecture with is 32-bit memory 
+      access and 64 bit instruction set (mx32).</para>
 
     <para>Continue only if you and your system meets the following 
