Index: chapter04/addinguser.xml
===================================================================
--- chapter04/addinguser.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter04/addinguser.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -85,6 +85,6 @@
   x86_64) chown -v lfs $LFS/lib64 ;;
 esac</userinput></screen>
-<screen arch="ml_32"  ><userinput>chown -v lfs $LFS&lib-m32;</userinput></screen>
-<screen arch="ml_x32" ><userinput>chown -v lfs $LFS&lib-mx32;</userinput></screen>
+<screen arch="ml_32"  ><userinput>chown -v lfs $LFS/lib32</userinput></screen>
+<screen arch="ml_x32" ><userinput>chown -v lfs $LFS/libx32</userinput></screen>
 <screen arch="ml_all" ><userinput>chown -v lfs $LFS/{lib32,libx32}</userinput></screen>
 
Index: chapter04/creatingminlayout.xml
===================================================================
--- chapter04/creatingminlayout.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter04/creatingminlayout.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -30,11 +30,11 @@
   x86_64) mkdir -pv $LFS/lib64 ;;
 esac</userinput></screen>
-<screen arch="ml_32"><userinput>mkdir -pv $LFS&usr-lib-m32;
-ln -sv usr&lib-m32; $LFS&lib-m32;</userinput></screen>
-<screen arch="ml_x32"><userinput>mkdir -pv $LFS&usr-lib-mx32;
-ln -sv usr&lib-mx32; $LFS&lib-mx32;</userinput></screen>
+<screen arch="ml_32"><userinput>mkdir -pv $LFS/usr/lib32
+ln -sv usr/lib32 $LFS/lib32</userinput></screen>
+<screen arch="ml_x32"><userinput>mkdir -pv $LFS/usr/libx32
+ln -sv usr/libx32 $LFS/libx32</userinput></screen>
 <screen arch="ml_all"><userinput>mkdir -pv $LFS/usr/lib{,x}32
-ln -sv usr&lib-m32; $LFS&lib-m32;
-ln -sv usr&lib-mx32; $LFS&lib-mx32;</userinput></screen>
+ln -sv usr/lib32 $LFS/lib32
+ln -sv usr/libx32 $LFS/libx32</userinput></screen>
 
     <note>
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter05/gcc-pass1.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -79,5 +79,5 @@
 
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-    -e '/m32=/s/m32=.*/m32=..\&lib-m32;$(call if_multiarch,:i386-linux-gnu)/' \
+    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     -i.orig gcc/config/i386/t-linux64
 </userinput></screen>
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter05/glibc.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -84,5 +84,6 @@
       --enable-kernel=&min-kernel;                \
       --with-headers=$LFS/usr/include    \
-      libc_cv_slibdir=/usr/lib</userinput></screen>
+      libc_cv_slibdir=/usr/lib           \
+      libc_cv_rtlddir=/usr/lib</userinput></screen>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure                             \
       --prefix=/usr                      \
@@ -92,5 +93,6 @@
       --with-headers=$LFS/usr/include    \
       --enable-multi-arch                \
-      libc_cv_slibdir=/usr/lib</userinput></screen>
+      libc_cv_slibdir=/usr/lib           \
+      libc_cv_rtlddir=/usr/lib</userinput></screen>
 
     <variablelist>
@@ -130,4 +132,12 @@
           <para>This ensures that the library is installed in /usr/lib instead
           of the default /lib64 on 64 bit machines.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>libc_cv_rtlddir=/usr/lib</parameter></term>
+        <listitem>
+          <para>Fix hardcoded path to the executable loader in the
+            <command>ldd</command> script.</para>
         </listitem>
       </varlistentry>
@@ -197,4 +207,34 @@
     </variablelist>
 
+    <!--
+      The /usr which gets removed from the RTLDLIST by the sed
+      below is set by the libc_cv_rtlddir=/usr/lib above. When
+      changing the libc_cv_rtlddir to /lib, the content of the
+      ldd script does not need to be patched, but some other
+      symlinks created by glibc itself will be not that correct
+      and needs to be fixed by other symlinks.
+
+      First setting /usr and than removing /usr seems strange,
+      but it looks like that libc_cv_rtlddir has more effect than
+      only the pathes in ldd (it has influence on which symlinks
+      to the loader are created where) and makes the handling
+      in a multilib environment much easier.
+      To me, it feels better to go the way with adding/removing
+      /usr than to introduce a symlink hell.
+      
+      Another option to get ldd working properly is to set a
+      symlink as "ln -svf lib /usr/lib64" but it has been reported
+      that we used that already years ago but dropped it since
+      libtool will complain sometimes with "library has been moved"
+      warnings.
+      Don't know if this is still the case - if not, this one
+      symlink seems to be the cleanest way and the sed on ldd will
+      be obsolete.
+    -->
+    <para>Fix hardcoded path to the executable loader in
+    <command>ldd</command> script:</para>
+
+<screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i $LFS/usr/bin/ldd</userinput></screen>
+
     <caution>
       <para>At this point, it is imperative to stop and ensure that the basic
@@ -246,5 +286,5 @@
 
     <para>Now recompile for m32. The extracted source can be
-    reused but needs to cleaned before installing the m32
+    reused but needs to be cleaned before installing the m32
     version of Glibc.</para>
 
@@ -266,7 +306,8 @@
       --with-headers=$LFS/usr/include    \
       --enable-multi-arch                \
-      --libdir=&usr-lib-m32;                \
-      --libexecdir=&usr-lib-m32;            \
-      libc_cv_slibdir=&usr-lib-m32;</userinput></screen>
+      --libdir=/usr/lib32                \
+      --libexecdir=/usr/lib32            \
+      libc_cv_slibdir=/usr/lib32           \
+      libc_cv_rtlddir=/usr/lib32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -277,8 +318,9 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&usr-lib-m32; $LFS/usr/
+cp -a DESTDIR/usr/lib32 $LFS/usr/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \
                $LFS/usr/include/gnu/
-ln -svf ..&lib-m32;/ld-linux.so.2 $LFS/lib/ld-linux.so.2</userinput></screen>
+ln -svf ../lib32/ld-linux.so.2 $LFS/lib/ld-linux.so.2</userinput></screen>
+
 
     <caution>
@@ -317,5 +359,5 @@
 
     <para>Now recompile for mx32. The extracted source can be
-    reused but needs to cleaned before installing the mx32
+    reused but needs to be cleaned before installing the mx32
     version of Glibc.</para>
 
@@ -337,7 +379,8 @@
       --with-headers=$LFS/usr/include    \
       --enable-multi-arch                \
-      --libdir=&usr-lib-mx32;               \
-      --libexecdir=&usr-lib-mx32;           \
-      libc_cv_slibdir=&usr-lib-mx32;</userinput></screen>
+      --libdir=/usr/libx32               \
+      --libexecdir=/usr/libx32           \
+      libc_cv_slibdir=/usr/libx32           \
+      libc_cv_rtlddir=/usr/libx32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -348,8 +391,8 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&usr-lib-mx32; $LFS/usr/
+cp -a DESTDIR/usr/libx32 $LFS/usr/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \
                $LFS/usr/include/gnu/
-ln -svf ..&lib-mx32;/ld-linux-x32.so.2 $LFS/lib/ld-linux-x32.so.2</userinput></screen>
+ln -svf ../libx32/ld-linux-x32.so.2 $LFS/lib/ld-linux-x32.so.2</userinput></screen>
 
     <caution>
Index: chapter06/gcc-pass2.xml
===================================================================
--- chapter06/gcc-pass2.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter06/gcc-pass2.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -71,5 +71,5 @@
 
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-    -e '/m32=/s/m32=.*/m32=..\&lib-m32;$(call if_multiarch,:i386-linux-gnu)/' \
+    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     -i.orig gcc/config/i386/t-linux64</userinput></screen>
 <!--
Index: chapter06/ncurses.xml
===================================================================
--- chapter06/ncurses.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter06/ncurses.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -168,5 +168,5 @@
             --host=$LFS_TGT32       \
             --build=$(./config.guess)    \
-            --libdir=&usr-lib-m32;     \
+            --libdir=/usr/lib32     \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -176,5 +176,5 @@
             --enable-pc-files       \
             --enable-widec          \
-            --with-pkg-config-libdir=&usr-lib-m32;/pkgconfig</userinput></screen>
+            --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen>
 
     <para>Compile the package:</para>
@@ -185,6 +185,6 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
-ln -s libncursesw.so DESTDIR&usr-lib-m32;/libcursesw.so
-cp -Rv DESTDIR&usr-lib-m32;/* $LFS&usr-lib-m32;
+ln -s libncursesw.so DESTDIR/usr/lib32/libcursesw.so
+cp -Rv DESTDIR/usr/lib32/* $LFS/usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -208,5 +208,5 @@
             --host=$LFS_TGTX32      \
             --build=$(./config.guess)    \
-            --libdir=&usr-lib-mx32;    \
+            --libdir=/usr/libx32    \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -216,5 +216,5 @@
             --enable-pc-files       \
             --enable-widec          \
-            --with-pkg-config-libdir=&usr-lib-mx32;/pkgconfig</userinput></screen>
+            --with-pkg-config-libdir=/usr/libx32/pkgconfig</userinput></screen>
 
     <para>Compile the package:</para>
@@ -225,6 +225,6 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
-ln -s libncursesw.so DESTDIR&usr-lib-mx32;/libcursesw.so
-cp -Rv DESTDIR&usr-lib-mx32;/* $LFS&usr-lib-mx32;
+ln -s libncursesw.so DESTDIR/usr/libx32/libcursesw.so
+cp -Rv DESTDIR/usr/libx32/* $LFS/usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter07/changingowner.xml
===================================================================
--- chapter07/changingowner.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter07/changingowner.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -41,6 +41,6 @@
   <para arch="ml_32,ml_x32,ml_all">Some more directories exists for
   multilib support. Change their ownership, too:</para>
-<screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">chown -R root:root $LFS&lib-m32;</userinput>
-<userinput arch="ml_x32,ml_all">chown -R root:root $LFS&lib-mx32;</userinput></screen>
+<screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">chown -R root:root $LFS/lib32</userinput>
+<userinput arch="ml_x32,ml_all">chown -R root:root $LFS/libx32</userinput></screen>
   
 </sect1>
Index: chapter07/util-linux.xml
===================================================================
--- chapter07/util-linux.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter07/util-linux.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -152,5 +152,5 @@
             --disable-static     \
             --without-python     \
-            --libdir=&usr-lib-m32;      \
+            --libdir=/usr/lib32      \
             --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -162,5 +162,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -192,5 +192,5 @@
             --disable-static     \
             --without-python     \
-            --libdir=&usr-lib-mx32; \
+            --libdir=/usr/libx32 \
             --host=x86_64-pc-linux-gnux32</userinput></screen>
 
@@ -202,5 +202,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/acl.xml
===================================================================
--- chapter08/acl.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/acl.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -81,6 +81,6 @@
     --prefix=/usr         \
     --disable-static      \
-    --libdir=&usr-lib-m32;   \
-    --libexecdir=&usr-lib-m32;   \
+    --libdir=/usr/lib32   \
+    --libexecdir=/usr/lib32   \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -92,5 +92,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -113,6 +113,6 @@
     --prefix=/usr          \
     --disable-static       \
-    --libdir=&usr-lib-mx32;   \
-    --libexecdir=&usr-lib-mx32;   \
+    --libdir=/usr/libx32   \
+    --libexecdir=/usr/libx32   \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
@@ -124,5 +124,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/attr.xml
===================================================================
--- chapter08/attr.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/attr.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -81,5 +81,5 @@
     --prefix=/usr         \
     --disable-static      \
-    --libdir=&usr-lib-m32; \
+    --libdir=/usr/lib32 \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -91,5 +91,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -112,5 +112,5 @@
     --prefix=/usr          \
     --disable-static       \
-    --libdir=&usr-lib-mx32;   \
+    --libdir=/usr/libx32   \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
@@ -122,5 +122,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/bzip2.xml
===================================================================
--- chapter08/bzip2.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/bzip2.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -119,9 +119,9 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1.0.8
-ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so
-ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1
-ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1.0
-install -Dm644 libbz2.a &usr-lib-m32;/libbz2.a</userinput></screen>
+<screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 /usr/lib32/libbz2.so.1.0.8
+ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so
+ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so.1
+ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so.1.0
+install -Dm644 libbz2.a /usr/lib32/libbz2.a</userinput></screen>
 
   </sect2><!-- m32 -->
@@ -146,9 +146,9 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1.0.8
-ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so
-ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1
-ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1.0
-install -Dm644 libbz2.a &usr-lib-mx32;/libbz2.a</userinput></screen>
+<screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 /usr/libx32/libbz2.so.1.0.8
+ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so
+ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so.1
+ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so.1.0
+install -Dm644 libbz2.a /usr/libx32/libbz2.a</userinput></screen>
 
   </sect2><!-- mx32 -->
Index: chapter08/eudev.xml
===================================================================
--- chapter08/eudev.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/eudev.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -102,9 +102,9 @@
             --bindir=/sbin               \
             --sbindir=/sbin              \
-            --libdir=&usr-lib-m32;          \
+            --libdir=/usr/lib32          \
             --sysconfdir=/etc            \
-            --libexecdir=&lib-m32;          \
+            --libexecdir=/lib32          \
             --with-rootprefix=           \
-            --with-rootlibdir=&usr-lib-m32; \
+            --with-rootlibdir=/usr/lib32 \
             --disable-manpages           \
             --disable-static             \
@@ -118,5 +118,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -140,9 +140,9 @@
             --bindir=/sbin               \
             --sbindir=/sbin              \
-            --libdir=&usr-lib-mx32;          \
+            --libdir=/usr/libx32          \
             --sysconfdir=/etc            \
-            --libexecdir=&lib-mx32;         \
+            --libexecdir=/libx32         \
             --with-rootprefix=           \
-            --with-rootlibdir=&usr-lib-mx32; \
+            --with-rootlibdir=/usr/libx32 \
             --disable-manpages           \
             --disable-static             \
@@ -156,5 +156,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/expat.xml
===================================================================
--- chapter08/expat.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/expat.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -83,5 +83,5 @@
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
     --prefix=/usr         \
-    --libdir=&usr-lib-m32;  \
+    --libdir=/usr/lib32  \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -93,5 +93,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -115,5 +115,5 @@
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
     --prefix=/usr         \
-    --libdir=&usr-lib-mx32; \
+    --libdir=/usr/libx32 \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
@@ -125,5 +125,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/file.xml
===================================================================
--- chapter08/file.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/file.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -75,5 +75,5 @@
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
     --prefix=/usr         \
-    --libdir=&usr-lib-m32;   \
+    --libdir=/usr/lib32   \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -85,5 +85,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -105,5 +105,5 @@
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
     --prefix=/usr          \
-    --libdir=&usr-lib-mx32;   \
+    --libdir=/usr/libx32   \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
@@ -115,5 +115,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/gcc.xml
===================================================================
--- chapter08/gcc.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/gcc.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -56,5 +56,5 @@
 
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-    -e '/m32=/s/m32=.*/m32=..\&lib-m32;$(call if_multiarch,:i386-linux-gnu)/' \
+    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     -i.orig gcc/config/i386/t-linux64</userinput></screen>
 
Index: chapter08/glibc.xml
===================================================================
--- chapter08/glibc.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/glibc.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -73,5 +73,6 @@
              --enable-stack-protector=strong          \
              --with-headers=/usr/include              \
-             libc_cv_slibdir=/usr/lib</userinput></screen>
+             libc_cv_slibdir=/usr/lib                 \
+             libc_cv_rtlddir=/usr/lib</userinput></screen>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr                            \
              --disable-werror                         \
@@ -80,5 +81,6 @@
              --with-headers=/usr/include              \
              --enable-multi-arch                      \
-             libc_cv_slibdir=/usr/lib</userinput></screen>
+             libc_cv_slibdir=/usr/lib                 \
+             libc_cv_rtlddir=/usr/lib</userinput></screen>
 
     <variablelist>
@@ -125,4 +127,12 @@
           <para>This variable sets the correct library for all
           systems.  We do not want lib64 to be used.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>libc_cv_rtlddir=/usr/lib</parameter></term>
+        <listitem>
+          <para>Fix hardcoded path to the executable loader in the
+            <command>ldd</command> script.</para>
         </listitem>
       </varlistentry>
@@ -222,4 +232,9 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+    <para>Fix hardcoded path to the executable loader in
+    <command>ldd</command> script:</para>
+
+<screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i /usr/bin/ldd</userinput></screen>
 
     <para>Install the configuration file and runtime directory for
@@ -483,5 +498,5 @@
 
     <para>Now recompile for m32. The extracted source can be
-    reused but needs to cleaned before installing the m32
+    reused but needs to be cleaned before installing the m32
     version of Glibc.</para>
 
@@ -502,7 +517,8 @@
       --with-headers=/usr/include        \
       --enable-multi-arch                \
-      --libdir=&usr-lib-m32;                \
-      --libexecdir=&usr-lib-m32;            \
-      libc_cv_slibdir=&usr-lib-m32;</userinput></screen>
+      --libdir=/usr/lib32                \
+      --libexecdir=/usr/lib32            \
+      libc_cv_slibdir=/usr/lib32         \
+      libc_cv_rtlddir=/usr/lib32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -513,12 +529,14 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&usr-lib-m32;/* &usr-lib-m32;/
+cp -a DESTDIR/usr/lib32/* /usr/lib32/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \
-               /usr/include/gnu/
-ln -svf ..&lib-m32;/ld-linux.so.2 /lib/ld-linux.so.2</userinput></screen>
+               /usr/include/gnu/</userinput></screen>
+<!-- no longer required as they are created in chap5
+ln -svf ../lib32/ld-linux.so.2 /lib/ld-linux.so.2
+-->
 
     <para>Add the library name to the dynamic loader config:</para>
 
-<screen role="install"><userinput>echo "&usr-lib-m32;" &gt;&gt; /etc/ld.so.conf</userinput></screen>
+<screen role="install"><userinput>echo "/usr/lib32" &gt;&gt; /etc/ld.so.conf</userinput></screen>
 
     <caution>
@@ -557,5 +575,5 @@
 
     <para>Now recompile for mx32. The extracted source can be
-    reused but needs to cleaned before installing the mx32
+    reused but needs to be cleaned before installing the mx32
     version of Glibc.</para>
 
@@ -574,9 +592,10 @@
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
-      --with-headers=$LFS/usr/include    \
+      --with-headers=/usr/include        \
       --enable-multi-arch                \
-      --libdir=&usr-lib-mx32;               \
-      --libexecdir=&usr-lib-mx32;           \
-      libc_cv_slibdir=&usr-lib-mx32;</userinput></screen>
+      --libdir=/usr/libx32               \
+      --libexecdir=/usr/libx32           \
+      libc_cv_slibdir=/usr/libx32         \
+      libc_cv_rtlddir=/usr/libx32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -587,12 +606,13 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;/
+cp -a DESTDIR/usr/libx32/* /usr/libx32/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \
-               /usr/include/gnu/
-ln -svf ..&lib-mx32;/ld-linux-x32.so.2 /lib/ld-linux-x32.so.2</userinput></screen>
-
+               /usr/include/gnu/</userinput></screen>
+<!-- no longer required as they are created in chap5
+ln -svf ../libx32/ld-linux-x32.so.2 /lib/ld-linux-x32.so.2
+-->
     <para>Add the library name to the dynamic loader config:</para>
 
-<screen role="install"><userinput>echo "&usr-lib-mx32;" &gt;&gt; /etc/ld.so.conf</userinput></screen>
+<screen role="install"><userinput>echo "/usr/libx32" &gt;&gt; /etc/ld.so.conf</userinput></screen>
 
     <caution>
Index: chapter08/gmp.xml
===================================================================
--- chapter08/gmp.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/gmp.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -143,11 +143,11 @@
 CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \
 CXXFLAGS="$CFLAGS" \
-PKG_CONFIG_PATH="&usr-lib-m32;/pkgconfig" \
+PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
 ./configure             \
     --prefix=/usr       \
     --disable-static    \
     --enable-cxx        \
-    --libdir=&usr-lib-m32; \
-    --includedir=&usr-inc-m32;/gmp</userinput></screen>
+    --libdir=/usr/lib32 \
+    --includedir=/usr/include/m32/gmp</userinput></screen>
 
     <variablelist>
@@ -155,5 +155,5 @@
 
       <varlistentry>
-        <term><parameter>--includedir=&usr-inc-m32;/gmp</parameter></term>
+        <term><parameter>--includedir=/usr/include/m32/gmp</parameter></term>
         <listitem>
           <para>Some definitions in gmp.h differs for each arch but
@@ -187,6 +187,6 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
-cp -Rv DESTDIR&usr-inc-m32;/* &usr-inc-m32;/
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+cp -Rv DESTDIR/usr/include/m32/* /usr/include/m32/
 rm -rf DESTDIR</userinput></screen>
 
@@ -215,11 +215,11 @@
 CFLAGS="-mx32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=x86-64" \
 CXXFLAGS="$CFLAGS" \
-PKG_CONFIG_PATH="&usr-lib-mx32;/pkgconfig" \
+PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
 ./configure              \
     --prefix=/usr        \
     --disable-static     \
     --enable-cxx         \
-    --libdir=&usr-lib-mx32; \
-    --includedir=&usr-inc-mx32;/gmp</userinput></screen>
+    --libdir=/usr/libx32 \
+    --includedir=/usr/include/mx32/gmp</userinput></screen>
 
     <para>Compile the package:</para>
@@ -245,6 +245,6 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
-cp -Rv DESTDIR&usr-inc-mx32;/* &usr-inc-mx32;/
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+cp -Rv DESTDIR/usr/include/mx32/* /usr/include/mx32/
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/kmod.xml
===================================================================
--- chapter08/kmod.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/kmod.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -102,10 +102,10 @@
     --prefix=/usr                 \
     --bindir=/bin                 \
-    --libdir=&usr-lib-m32;          \
+    --libdir=/usr/lib32          \
     --sysconfdir=/etc             \
     --with-xz                     \
     --with-zlib                   \
     --host=i686-pc-linux-gnu      \
-    --with-rootlibdir=&usr-lib-m32;</userinput></screen>
+    --with-rootlibdir=/usr/lib32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -116,5 +116,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -139,10 +139,10 @@
     --prefix=/usr                 \
     --bindir=/bin                 \
-    --libdir=&usr-lib-mx32;          \
+    --libdir=/usr/libx32          \
     --sysconfdir=/etc             \
     --with-xz                     \
     --with-zlib                   \
     --host=x86_64-pc-linux-gnux32 \
-    --with-rootlibdir=&usr-lib-mx32;</userinput></screen>
+    --with-rootlibdir=/usr/libx32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -153,5 +153,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/libcap.xml
===================================================================
--- chapter08/libcap.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/libcap.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -98,7 +98,7 @@
 
 <screen><userinput remap="install">make lib=lib32 prefix=$PWD/DESTDIR/usr -C libcap install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
-sed -e "s|^libdir=.*|libdir=&usr-lib-m32;|" -i &usr-lib-m32;/pkgconfig/lib{cap,psx}.pc
-chmod -v 755 &usr-lib-m32;/libcap.so.&libcap-version;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+sed -e "s|^libdir=.*|libdir=/usr/lib32|" -i /usr/lib32/pkgconfig/lib{cap,psx}.pc
+chmod -v 755 /usr/lib32/libcap.so.&libcap-version;
 rm -rf DESTDIR</userinput></screen>
 
@@ -123,7 +123,7 @@
 
 <screen><userinput remap="install">make lib=libx32 prefix=$PWD/DESTDIR/usr -C libcap install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
-sed -e "s|^libdir=.*|libdir=&usr-lib-mx32;|" -i &usr-lib-mx32;/pkgconfig/lib{cap,psx}.pc
-chmod -v 755 &usr-lib-mx32;/libcap.so.&libcap-version;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+sed -e "s|^libdir=.*|libdir=/usr/libx32|" -i /usr/libx32/pkgconfig/lib{cap,psx}.pc
+chmod -v 755 /usr/libx32/libcap.so.&libcap-version;
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/libelf.xml
===================================================================
--- chapter08/libelf.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/libelf.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -84,5 +84,5 @@
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
     --prefix=/usr            \
-    --libdir=&usr-lib-m32;     \
+    --libdir=/usr/lib32     \
     --host=i686-pc-linux-gnu \
     --disable-debuginfod     \
@@ -96,6 +96,6 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR -C libelf install
-install -vDm644 config/libelf.pc DESTDIR&usr-lib-m32;/pkgconfig/libelf.pc
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+install -vDm644 config/libelf.pc DESTDIR/usr/lib32/pkgconfig/libelf.pc
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -117,5 +117,5 @@
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
     --prefix=/usr                 \
-    --libdir=&usr-lib-m32;           \
+    --libdir=/usr/lib32           \
     --host=x86_64-pc-linux-gnux32 \
     --disable-debuginfod          \
@@ -129,6 +129,6 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR -C libelf install
-install -vDm644 config/libelf.pc DESTDIR&usr-lib-mx32;/pkgconfig/libelf.pc
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+install -vDm644 config/libelf.pc DESTDIR/usr/libx32/pkgconfig/libelf.pc
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/libffi.xml
===================================================================
--- chapter08/libffi.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/libffi.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -104,5 +104,5 @@
     --prefix=/usr            \
     --disable-static         \
-    --libdir=&usr-lib-m32;     \
+    --libdir=/usr/lib32     \
     --with-gcc-arch=i686     \
     --host=i686-pc-linux-gnu</userinput></screen>
@@ -119,5 +119,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -140,5 +140,5 @@
     --prefix=/usr            \
     --disable-static         \
-    --libdir=&usr-lib-mx32;     \
+    --libdir=/usr/libx32     \
     --with-gcc-arch=x86_64   \
     --host=x86_64-unknown-linux-gnux32</userinput></screen>
@@ -155,5 +155,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/libtool.xml
===================================================================
--- chapter08/libtool.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/libtool.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -93,5 +93,5 @@
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
     --prefix=/usr         \
-    --libdir=&usr-lib-m32;  \
+    --libdir=/usr/lib32  \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -103,5 +103,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -123,5 +123,5 @@
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
     --prefix=/usr         \
-    --libdir=&usr-lib-mx32;  \
+    --libdir=/usr/libx32  \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
@@ -133,5 +133,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/ncurses.xml
===================================================================
--- chapter08/ncurses.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/ncurses.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -166,5 +166,5 @@
 ./configure --prefix=/usr           \
             --host=i686-pc-linux-gnu \
-            --libdir=&usr-lib-m32;     \
+            --libdir=/usr/lib32     \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -173,5 +173,5 @@
             --enable-pc-files       \
             --enable-widec          \
-            --with-pkg-config-libdir=&usr-lib-m32;/pkgconfig</userinput></screen>
+            --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen>
 
     <para>Compile the package:</para>
@@ -182,14 +182,14 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-mkdir -p DESTDIR&usr-lib-m32;/pkgconfig
+mkdir -p DESTDIR/usr/lib32/pkgconfig
 for lib in ncurses form panel menu ; do
-    rm -vf                    DESTDIR&usr-lib-m32;/lib${lib}.so
-    echo "INPUT(-l${lib}w)" > DESTDIR&usr-lib-m32;/lib${lib}.so
-    ln -svf ${lib}w.pc        DESTDIR&usr-lib-m32;/pkgconfig/$lib.pc
+    rm -vf                    DESTDIR/usr/lib32/lib${lib}.so
+    echo "INPUT(-l${lib}w)" > DESTDIR/usr/lib32/lib${lib}.so
+    ln -svf ${lib}w.pc        DESTDIR/usr/lib32/pkgconfig/$lib.pc
 done
-rm -vf                     DESTDIR&usr-lib-m32;/libcursesw.so
-echo "INPUT(-lncursesw)" > DESTDIR&usr-lib-m32;/libcursesw.so
-ln -sfv libncurses.so      DESTDIR&usr-lib-m32;/libcurses.so
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+rm -vf                     DESTDIR/usr/lib32/libcursesw.so
+echo "INPUT(-lncursesw)" > DESTDIR/usr/lib32/libcursesw.so
+ln -sfv libncurses.so      DESTDIR/usr/lib32/libcurses.so
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -211,5 +211,5 @@
 ./configure --prefix=/usr           \
             --host=x86_64-pc-linux-gnux32 \
-            --libdir=&usr-lib-mx32;    \
+            --libdir=/usr/libx32    \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -218,5 +218,5 @@
             --enable-pc-files       \
             --enable-widec          \
-            --with-pkg-config-libdir=&usr-lib-mx32;/pkgconfig</userinput></screen>
+            --with-pkg-config-libdir=/usr/libx32/pkgconfig</userinput></screen>
 
     <para>Compile the package:</para>
@@ -227,14 +227,14 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-mkdir -p DESTDIR&usr-lib-mx32;/pkgconfig
+mkdir -p DESTDIR/usr/libx32/pkgconfig
 for lib in ncurses form panel menu ; do
-    rm -vf                    DESTDIR&usr-lib-mx32;/lib${lib}.so
-    echo "INPUT(-l${lib}w)" > DESTDIR&usr-lib-mx32;/lib${lib}.so
-    ln -svf ${lib}w.pc        DESTDIR&usr-lib-mx32;/pkgconfig/$lib.pc
+    rm -vf                    DESTDIR/usr/libx32/lib${lib}.so
+    echo "INPUT(-l${lib}w)" > DESTDIR/usr/libx32/lib${lib}.so
+    ln -svf ${lib}w.pc        DESTDIR/usr/libx32/pkgconfig/$lib.pc
 done
-rm -vf                     DESTDIR&usr-lib-mx32;/libcursesw.so
-echo "INPUT(-lncursesw)" > DESTDIR&usr-lib-mx32;/libcursesw.so
-ln -sfv libncurses.so      DESTDIR&usr-lib-mx32;/libcurses.so
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+rm -vf                     DESTDIR/usr/libx32/libcursesw.so
+echo "INPUT(-lncursesw)" > DESTDIR/usr/libx32/libcursesw.so
+ln -sfv libncurses.so      DESTDIR/usr/libx32/libcurses.so
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/openssl.xml
===================================================================
--- chapter08/openssl.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/openssl.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -98,5 +98,5 @@
     ./config               \
     --prefix=/usr          \
-    --libdir=&usr-lib-m32;    \
+    --libdir=/usr/lib32    \
     --openssldir=/etc/ssl  \
     --libdir=lib32         \
@@ -111,5 +111,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -134,5 +134,5 @@
     ./config              \
     --prefix=/usr         \
-    --libdir=&usr-lib-mx32;  \
+    --libdir=/usr/libx32  \
     --openssldir=/etc/ssl \
     --libdir=libx32       \
@@ -147,5 +147,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/readline.xml
===================================================================
--- chapter08/readline.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/readline.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -116,5 +116,5 @@
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
     --prefix=/usr                     \
-    --libdir=&usr-lib-m32;               \
+    --libdir=/usr/lib32               \
     --disable-static                  \
     --host=i686-pc-linux-gnu</userinput></screen>
@@ -127,5 +127,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -147,5 +147,5 @@
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
     --prefix=/usr          \
-    --libdir=&usr-lib-mx32;   \
+    --libdir=/usr/libx32   \
     --disable-static       \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
@@ -158,5 +158,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/revisedchroot.xml
===================================================================
--- chapter08/revisedchroot.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/revisedchroot.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -45,6 +45,6 @@
 
 <screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput><userinput arch="ml_32,ml_all">
-find &usr-lib-m32; -name \*.la -delete</userinput><userinput arch="ml_x32,ml_all">
-find &usr-lib-mx32; -name \*.la -delete</userinput></screen>
+find /usr/lib32 -name \*.la -delete</userinput><userinput arch="ml_x32,ml_all">
+find /usr/libx32 -name \*.la -delete</userinput></screen>
 
    <para>For more information about libtool archive files, see the <ulink
Index: chapter08/strippingagain.xml
===================================================================
--- chapter08/strippingagain.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/strippingagain.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -45,5 +45,5 @@
 done</userinput>
 <userinput arch="ml_32,ml_all">
-cd &usr-lib-m32;
+cd /usr/lib32
 for LIB in $save_usrlib; do
     objcopy --only-keep-debug $LIB $LIB.dbg 
@@ -52,5 +52,5 @@
 done</userinput>
 <userinput arch="ml_x32,ml_all">
-cd &usr-lib-mx32;
+cd /usr/libx32
 for LIB in $save_usrlib; do
     objcopy --only-keep-debug $LIB $LIB.dbg 
@@ -71,14 +71,14 @@
 <screen><userinput>find /usr/lib -type f -name \*.a \
    -exec strip --strip-debug {} ';'</userinput>
-<userinput arch="ml_32,ml_all">find &usr-lib-m32; -type f -name \*.a \
+<userinput arch="ml_32,ml_all">find /usr/lib32 -type f -name \*.a \
    -exec strip --strip-debug {} ';'</userinput>
-<userinput arch="ml_x32,ml_all">find &usr-lib-mx32; -type f -name \*.a \
+<userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.a \
    -exec strip --strip-debug {} ';'</userinput><userinput>
 
 find /usr/lib -type f -name \*.so* ! -name \*dbg \
    -exec strip --strip-unneeded {} ';'</userinput>
-<userinput arch="ml_32,ml_all">find &usr-lib-m32; -type f -name \*.so* ! -name \*dbg \
+<userinput arch="ml_32,ml_all">find /usr/lib32 -type f -name \*.so* ! -name \*dbg \
    -exec strip --strip-unneeded {} ';'</userinput>
-<userinput arch="ml_x32,ml_all">find &usr-lib-mx32; -type f -name \*.so* ! -name \*dbg \
+<userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.so* ! -name \*dbg \
    -exec strip --strip-unneeded {} ';'</userinput><userinput>
 
Index: chapter08/systemd.xml
===================================================================
--- chapter08/systemd.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/systemd.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -52,7 +52,9 @@
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
 
+<!-- Seems to be not needed anymore with 248
     <para>Remove tests that cannot be built in chroot:</para>
 
 <screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
+-->
 
     <para>Remove an unneeded group,
@@ -240,5 +242,5 @@
     <para>Prepare systemd for compilation:</para>
 
-    <screen><userinput remap="configure">PKG_CONFIG_PATH="&usr-lib-m32;/pkgconfig" \
+    <screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
 CC="gcc -m32 -march=i686"              \
 CXX="g++ -m32 -march=i686"             \
@@ -257,5 +259,5 @@
       -Dmount-path=/bin/mount          \
       -Drootprefix=                    \
-      -Drootlibdir=&usr-lib-m32;          \
+      -Drootlibdir=/usr/lib32          \
       -Dsplit-usr=true                 \
       -Dsulogin-path=/sbin/sulogin     \
@@ -272,5 +274,5 @@
 
 <screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR
 rm -f /usr/bin/xsltproc</userinput></screen>
@@ -300,5 +302,5 @@
     <para>Prepare systemd for compilation:</para>
 
-<screen><userinput remap="configure">PKG_CONFIG_PATH="&usr-lib-mx32;/pkgconfig" \
+<screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
 CC="gcc -mx32"                          \
 CXX="g++ -mx32"                         \
@@ -319,5 +321,5 @@
       -Dmount-path=/bin/mount           \
       -Drootprefix=                     \
-      -Drootlibdir=&usr-lib-mx32;          \
+      -Drootlibdir=/usr/libx32          \
       -Dsplit-usr=true                  \
       -Dsulogin-path=/sbin/sulogin      \
@@ -334,5 +336,5 @@
 
 <screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR
 rm -f /usr/bin/xsltproc</userinput></screen>
Index: chapter08/util-linux.xml
===================================================================
--- chapter08/util-linux.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/util-linux.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -131,5 +131,5 @@
             --without-python         \
             --without-systemd        \
-            --libdir=&usr-lib-m32;      \
+            --libdir=/usr/lib32      \
             --host=i686-pc-linux-gnu \
             --without-systemdsystemunitdir \
@@ -148,5 +148,5 @@
             --disable-static         \
             --without-python         \
-            --libdir=&usr-lib-m32;      \
+            --libdir=/usr/lib32      \
             --host=i686-pc-linux-gnu \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -159,5 +159,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -191,5 +191,5 @@
             --without-systemd    \
             --without-systemdsystemunitdir \
-            --libdir=&usr-lib-mx32; \
+            --libdir=/usr/libx32 \
             --host=x86_64-pc-linux-gnux32 \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -207,5 +207,5 @@
             --disable-static     \
             --without-python     \
-            --libdir=&usr-lib-mx32; \
+            --libdir=/usr/libx32 \
             --host=x86_64-pc-linux-gnux32 \
             --enable-libmount-force-mountinfo</userinput></screen>
@@ -218,5 +218,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/xz.xml
===================================================================
--- chapter08/xz.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/xz.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -81,5 +81,5 @@
     --prefix=/usr         \
     --disable-static      \
-    --libdir=&usr-lib-m32;   \
+    --libdir=/usr/lib32   \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -91,5 +91,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -112,5 +112,5 @@
     --prefix=/usr          \
     --disable-static       \
-    --libdir=&usr-lib-mx32;   \
+    --libdir=/usr/libx32   \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
@@ -122,5 +122,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/zlib.xml
===================================================================
--- chapter08/zlib.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/zlib.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -79,5 +79,5 @@
 <screen><userinput remap="configure">CC="gcc -m32" \
 ./configure --prefix=/usr \
-    --libdir=&usr-lib-m32;</userinput></screen>
+    --libdir=/usr/lib32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -88,5 +88,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -106,5 +106,5 @@
 <screen><userinput remap="configure">CC="gcc -mx32" \
 ./configure --prefix=/usr    \
-    --libdir=&usr-lib-mx32;</userinput></screen>
+    --libdir=/usr/libx32</userinput></screen>
 
     <para>Compile the package:</para>
@@ -115,5 +115,5 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>
 
Index: chapter08/zstd.xml
===================================================================
--- chapter08/zstd.xml	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ chapter08/zstd.xml	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -78,6 +78,6 @@
 
 <screen><userinput remap="install">CC="gcc -m32" make prefix=/usr DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR/usr/lib/* &usr-lib-m32;/
-sed -e "/^libdir/s/lib$&lib-m32;/" -i &usr-lib-m32;/pkgconfig/libzstd.pc
+cp -Rv DESTDIR/usr/lib/* /usr/lib32/
+sed -e "/^libdir/s/lib$/lib32/" -i /usr/lib32/pkgconfig/libzstd.pc
 rm -rf DESTDIR</userinput></screen>
 
@@ -102,6 +102,6 @@
 
 <screen><userinput remap="install">CC="gcc -mx32" make prefix=/usr DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR/usr/lib/* &usr-lib-mx32;/
-sed -e "/^libdir/s/lib$&lib-mx32;/" -i &usr-lib-mx32;/pkgconfig/libzstd.pc
+cp -Rv DESTDIR/usr/lib/* /usr/libx32/
+sed -e "/^libdir/s/lib$/libx32/" -i /usr/libx32/pkgconfig/libzstd.pc
 rm -rf DESTDIR</userinput></screen>
 
Index: general.ent
===================================================================
--- general.ent	(revision 51c01bff45014f6ee0fb96d88a41dea4dd4f575c)
+++ general.ent	(revision 0ebda1115870a5e97ea3aab8a537d95544ce74e6)
@@ -64,10 +64,2 @@
 <!ENTITY % patches-entities SYSTEM "patches.ent">
 %patches-entities;
-
-<!-- multilib definitions -->
-<!ENTITY lib-m32          "/lib32">
-<!ENTITY lib-mx32         "/libx32">
-<!ENTITY usr-lib-m32      "/usr/lib32">
-<!ENTITY usr-lib-mx32     "/usr/libx32">
-<!ENTITY usr-inc-m32      "/usr/include/m32">
-<!ENTITY usr-inc-mx32     "/usr/include/mx32">
