Index: BOOK/final-system/multilib/systemd-64bit.xml
===================================================================
--- BOOK/final-system/multilib/systemd-64bit.xml	(revision 5847541e02bd58ee1d4bfaa6a0b6f439feda84a0)
+++ BOOK/final-system/multilib/systemd-64bit.xml	(revision df44c72fa87f66a346a170e8ae818c0ecd03b4cc)
@@ -27,7 +27,7 @@
 <screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
   ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
-    --with-rootprefix="" -with-rootlibdir=/lib \
+    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64 --docdir=/usr/share/doc/systemd-&systemd-version; \
+    --with-rootprefix="" -with-rootlibdir=/lib64 \
     --enable-split-usr --disable-gudev</userinput></screen>
 
Index: BOOK/final-system/multilib/systemd-n32.xml
===================================================================
--- BOOK/final-system/multilib/systemd-n32.xml	(revision 5847541e02bd58ee1d4bfaa6a0b6f439feda84a0)
+++ BOOK/final-system/multilib/systemd-n32.xml	(revision df44c72fa87f66a346a170e8ae818c0ecd03b4cc)
@@ -32,5 +32,5 @@
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
   ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var \
+    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \
     --libexecdir=/usr/lib32 --docdir=/usr/share/doc/systemd-&systemd-version; \
     --with-rootprefix="" -with-rootlibdir=/lib32 \
@@ -38,42 +38,18 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="systemd.xml"
+    href="../common/systemd.xml"
     xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>
Index: BOOK/final-system/multilib/systemd.xml
===================================================================
--- BOOK/final-system/multilib/systemd.xml	(revision 5847541e02bd58ee1d4bfaa6a0b6f439feda84a0)
+++ BOOK/final-system/multilib/systemd.xml	(revision df44c72fa87f66a346a170e8ae818c0ecd03b4cc)
@@ -46,5 +46,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make pam_systemd.la</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -52,29 +54,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>make install-pamlibLTLIBRARIES</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/systemd.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
