Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/appendices/dependencies/common.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -31,4 +31,32 @@
   </para>
 
+<!-- Begin Attr dependency info -->
+  <bridgehead renderas="sect2" id="attr-dep">Attr</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Autoconf, Automake, Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
+         Libtool, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Libcap</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Autoconf dependency info -->
   <bridgehead renderas="sect2" id="autoconf-dep">Autoconf</bridgehead>
@@ -254,4 +282,32 @@
       </segmentedlist>
 
+<!-- Begin D-Bus dependency info -->
+  <bridgehead renderas="sect2" id="dbus-dep">D-Bus</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
+         Gettext, Grep, Make, Man, Pkg-config, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin DejaGNU dependency info -->
   <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
@@ -364,4 +420,32 @@
       </segmentedlist>
 
+<!-- Begin Expat dependency info -->
+  <bridgehead renderas="sect2" id="expat-dep">Expat</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
+         Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>D-Bus</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Expect dependency info -->
   <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
@@ -836,4 +920,31 @@
       </segmentedlist>
 
+<!-- Begin Libcap dependency info -->
+  <bridgehead renderas="sect2" id="libcap-dep">Libcap</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, EGLIBC, GCC, Grep and Make</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Libtool dependency info -->
   <bridgehead renderas="sect2" id="libtool-dep">Libtool</bridgehead>
@@ -999,5 +1110,5 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>D-Bus</seg>
         </seglistitem>
       </segmentedlist>
@@ -1222,5 +1333,5 @@
 
         <seglistitem>
-          <seg>Util-linux, E2fsprogs</seg>
+          <seg>E2fsprogs, Pkg-config, systemd, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
@@ -1393,4 +1504,32 @@
       </segmentedlist>
 
+<!-- Begin systemd dependency info -->
+  <bridgehead renderas="sect2" id="systemd-dep">systemd</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, D-Bus, EGLIBC, Findutils, Gawk, GCC,
+         Grep, Libcap, Make, Pkg-config, Sed, Udev and Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Sysvinit dependency info -->
   <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
@@ -1528,5 +1667,5 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>systemd</seg>
         </seglistitem>
       </segmentedlist>
@@ -1556,5 +1695,5 @@
 
         <seglistitem>
-          <seg>E2fsprogs</seg>
+          <seg>E2fsprogs, systemd</seg>
         </seglistitem>
       </segmentedlist>
@@ -1639,5 +1778,5 @@
 
         <seglistitem>
-          <seg>File, Module-Init-Tools and Util-linux</seg>
+          <seg>Binutils, File, Module-Init-Tools and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/boot/common/devices.xml
===================================================================
--- BOOK/boot/common/devices.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/boot/common/devices.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -35,11 +35,23 @@
     the following commands:</para>
 
-<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
-mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 0600 ${CLFS}/dev/console c 5 1
+mknod -m 0666 ${CLFS}/dev/null c 1 3
+mknod -m 0666 ${CLFS}/dev/zero c 1 5</userinput></screen>
 
-    <para>Before udev starts a tmpfs filesystem is mounted over <filename class="directory">/dev</filename> and the previous entries are no-longer available. The folling command creates files that are copied over by the udev bootscript:</para>
+    <para>When systemd starts a tmpfs filesystem is mounted over
+    <filename class="directory">/dev</filename> and the previous entries are
+    no-longer available. The folling command creates files that are copied
+    over when udevd starts:</para>
 
-<screen><userinput>mknod -m 600 ${CLFS}/lib/udev/devices/console c 5 1
-mknod -m 666 ${CLFS}/lib/udev/devices/null c 1 3</userinput></screen>
+<screen><userinput>mkdir -pv ${CLFS}/lib/udev/devices/{pts,shm}
+mknod -m 0600 ${CLFS}/lib/udev/devices/console c 5 1
+mknod -m 0666 ${CLFS}/lib/udev/devices/null c 1 3
+mknod -m 0666 ${CLFS}/lib/udev/devices/zero c 1 5
+mknod -m 0600 ${CLFS}/lib/udev/devices/kmsg c 1 11
+ln -snvf /proc/self/fd ${CLFS}/lib/udev/devices/fd
+ln -snvf /proc/self/fd/0 ${CLFS}/lib/udev/devices/stdin
+ln -snvf /proc/self/fd/1 ${CLFS}/lib/udev/devices/stdout
+ln -snvf /proc/self/fd/2 ${CLFS}/lib/udev/devices/stderr
+ln -snvf /proc/kcore ${CLFS}/lib/udev/devices/core</userinput></screen>
 
   </sect2>
Index: BOOK/boot/common/pwdgroup.xml
===================================================================
--- BOOK/boot/common/pwdgroup.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/boot/common/pwdgroup.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -45,4 +45,5 @@
 <screen><userinput>cat &gt; ${CLFS}/etc/passwd &lt;&lt; "EOF"
 <literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
+<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 
@@ -131,5 +132,6 @@
 utmp:x:&gid-utmp;:
 usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:</literal>
+cdrom:x:&gid-cdrom;:
+messagebus:x:&gid-messagebus;:</literal>
 EOF</userinput></screen>
 
Index: BOOK/chroot/common/pwdgroup.xml
===================================================================
--- BOOK/chroot/common/pwdgroup.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/chroot/common/pwdgroup.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -44,4 +44,5 @@
 <screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
 <literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
+<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 
@@ -73,5 +74,6 @@
 utmp:x:&gid-utmp;:
 usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:</literal>
+cdrom:x:&gid-cdrom;:
+messagebus:x:&gid-messagebus;:</literal>
 EOF</userinput></screen>
 
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/alpha-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -43,4 +43,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
@@ -58,11 +59,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
Index: BOOK/final-system/common/attr.xml
===================================================================
--- BOOK/final-system/common/attr.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/common/attr.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-attr" role="wrap">
+  <?dbhtml filename="attr.html"?>
+
+  <title>Attr-&attr-version;</title>
+
+  <indexterm zone="ch-system-attr">
+    <primary sortas="a-Attr">Attr</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Attr is a library for getting and setting POSIX.1e
+    (formerly POSIX 6) draft 15 capabilities.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Attr</title>
+
+    <para os="a">Prepare Attr for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr \
+    --libdir=/lib --libexecdir=/usr/lib</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">This package does not come with a test suite.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install install-dev install-lib</userinput></screen>
+
+    <para os="h">Remove extra symlinks:</para>
+
+<screen os="i"><userinput>rm -v /lib/libattr.{,l}a</userinput></screen>
+
+    <para os="j">Set the proper permissions on the library:</para>
+
+<screen os="k"><userinput>chmod 755 -v /lib/libattr.so.1.1.0</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-attr" role="content">
+    <title>Contents of Attr</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>attr, getfattr, setfattr</seg>
+        <seg>libattr.[a,so]</seg>
+        <seg>/usr/include/attr</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="attr">
+        <term><command>attr</command></term>
+        <listitem>
+          <para>Manage extended attributes on filesystem objects</para>
+          <indexterm zone="ch-system-attr attr">
+            <primary sortas="b-attr">attr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getfattr">
+        <term><command>getfattr</command></term>
+        <listitem>
+          <para>Get extended attributes of filesystem objects</para>
+          <indexterm zone="ch-system-attr getfattr">
+            <primary sortas="b-getfattr">getfattr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfattr">
+        <term><command>setfattr</command></term>
+        <listitem>
+          <para>Set extended attributes of filesystem objects</para>
+          <indexterm zone="ch-system-attr setfattr">
+            <primary sortas="b-setfattr">setfattr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libattr">
+        <term><filename class="libraryfile">libattr</filename></term>
+        <listitem>
+          <para>Library to manage extended attributes on filesystem objects</para>
+          <indexterm zone="ch-system-attr libattr">
+            <primary sortas="c-libattr">libattr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/common/coreutils.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -88,13 +88,4 @@
 mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
 mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
-
-    <para os="v">Other Coreutils programs are used by some of the scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="w"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
-mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
-ln -svf ../../bin/install /usr/bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/dbus.xml
===================================================================
--- BOOK/final-system/common/dbus.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/common/dbus.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-dbus" role="wrap">
+  <?dbhtml filename="dbus.html"?>
+
+  <title>D-Bus-&dbus-version;</title>
+
+  <indexterm zone="ch-system-dbus">
+    <primary sortas="a-D-Bus">D-Bus</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>D-Bus is a message bus system, a simple way for applications
+    to talk to one another.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of D-Bus</title>
+
+    <para os="a">Prepare Vim for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
+    --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">This package does not come with a test suite.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-dbus" role="content">
+    <title>Contents of D-Bus</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>dbus-cleanup-sockets, dbus-daemon, dbus-uuidgen, dbus-monitor, dbus-launch, dbus-send</seg>
+        <seg>libdbus-1.[a,so]</seg>
+        <seg>/etc/dbus-1, /usr/lib/dbus-1.0,
+        /usr/share/dbus-1, /var/lib/dbus</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="dbus-cleanup-sockets">
+        <term><command>dbus-cleanup-sockets</command></term>
+        <listitem>
+          <para>Cleans up leftover sockets in a directory</para>
+          <indexterm zone="ch-system-dbus dbus-cleanup-sockets">
+            <primary sortas="b-dbus-cleanup-sockets">dbus-cleanup-sockets</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dbus-daemon">
+        <term><command>dbus-daemon</command></term>
+        <listitem>
+          <para>The message bus daemon</para>
+          <indexterm zone="ch-system-dbus dbus-daemon">
+            <primary sortas="b-dbus-daemon">dbus-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dbus-uuidgen">
+        <term><command>dbus-uuidgen</command></term>
+        <listitem>
+          <para>Utility to generate UUIDs</para>
+          <indexterm zone="ch-system-dbus dbus-uuidgen">
+            <primary sortas="b-dbus-uuidgen">dbus-uuidgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dbus-monitor">
+        <term><command>dbus-monitor</command></term>
+        <listitem>
+          <para>A debug probe that prints message bus messages</para>
+          <indexterm zone="ch-system-dbus dbus-monitor">
+            <primary sortas="b-dbus-monitor">dbus-monitor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dbus-launch">
+        <term><command>dbus-launch</command></term>
+        <listitem>
+          <para>Utility to start a message bus from a shell script</para>
+          <indexterm zone="ch-system-dbus dbus-launch">
+            <primary sortas="b-dbus-launch">dbus-launch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dbus-send">
+        <term><command>dbus-send</command></term>
+        <listitem>
+          <para>Send a message to a message bus</para>
+          <indexterm zone="ch-system-dbus dbus-send">
+            <primary sortas="b-dbus-send">dbus-send</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdbus-1">
+        <term><filename class="libraryfile">libdbus-1</filename></term>
+        <listitem>
+          <para>Library containing the API for using the message bus</para>
+          <indexterm zone="ch-system-dbus libdbus-1">
+            <primary sortas="c-libdbus-1">libdbus-1</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/expat.xml
===================================================================
--- BOOK/final-system/common/expat.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/common/expat.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-expat" role="wrap">
+  <?dbhtml filename="expat.html"?>
+
+  <title>Expat-&expat-version;</title>
+
+  <indexterm zone="ch-system-expat">
+    <primary sortas="a-Expat">Expat</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Expat is a stream-oriented XML parser library written in C.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+    <para os="a">Prepare Expat for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">To test the results, issue:
+    <userinput>make check</userinput>.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+    <para os="h">Install the documentation:</para>
+
+<screen os="i"><userinput>install -v -m755 -d /usr/share/doc/expat-&expat-version;
+install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
+
+
+  </sect2>
+
+  <sect2 id="contents-expat" role="content">
+    <title>Contents of Expat</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <segtitle>Installed library</segtitle>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>xmlwf</seg>
+        <seg>libexpat.[so,a]</seg>
+        <seg>/usr/share/doc/expat-&expat-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xmlwf">
+        <term><command>xmlwf</command></term>
+        <listitem>
+          <para>is a non-validating utility to check whether or not XML
+          documents are well formed</para>
+          <indexterm zone="ch-system-expat xmlwf">
+            <primary sortas="b-xmlwf">xmlwf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libexpat">
+        <term><filename class="libraryfile">libexpat</filename></term>
+        <listitem>
+          <para>contains API functions for parsing XML</para>
+          <indexterm zone="ch-system-expat libexpat">
+            <primary sortas="c-libexpat">libexpat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/common/kbd.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -40,10 +40,9 @@
 <screen os="g"><userinput>make install</userinput></screen>
 
-    <para os="h">Some of the programs from Kbd are used by scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,dumpkeys,loadkeys,openvt,setfont} /bin</userinput></screen>
+    <para os="h">Some of the programs from Kbd are used by systemd to
+    initialize the system, those binaries need to be on the root
+    partition:</para>
+
+<screen os="i"><userinput>mv -v /usr/bin/{loadkeys,setfont} /bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/libcap.xml
===================================================================
--- BOOK/final-system/common/libcap.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/common/libcap.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libcap" role="wrap">
+  <?dbhtml filename="libcap.html"?>
+
+  <title>Libcap-&libcap-version;</title>
+
+  <indexterm zone="ch-system-libcap">
+    <primary sortas="a-Libcap">Libcap</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Libcap is a library for getting and setting POSIX.1e
+    (formerly POSIX 6) draft 15 capabilities.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libcap</title>
+
+    <para os="a">Compile the package:</para>
+
+<screen os="b"><userinput>make</userinput></screen>
+
+    <para os="c">This package does not come with a test suite.</para>
+
+    <para os="d">Install the package:</para>
+
+<screen os="e"><userinput>make lib=lib install
+chmod -v 755 /lib/libcap.so.&libcap-version;
+rm /lib/libcap.so
+ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so
+mv -v /lib/libcap.a /usr/lib</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-libcap" role="content">
+    <title>Contents of Libcap</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+
+      <seglistitem>
+        <seg>capsh, setcap, getpcaps, getcap</seg>
+        <seg>libcap.[a,so]</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="capsh">
+        <term><command>capsh</command></term>
+        <listitem>
+          <para>Capability support and use can be explored and constrained
+          with this tool</para>
+          <indexterm zone="ch-system-libcap capsh">
+            <primary sortas="b-capsh">capsh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setcap">
+        <term><command>setcap</command></term>
+        <listitem>
+          <para>Sets file capabilities</para>
+          <indexterm zone="ch-system-libcap setcap">
+            <primary sortas="b-setcap">setcap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getpcaps">
+        <term><command>getpcaps</command></term>
+        <listitem>
+          <para>Displays the capabilities on the queried process(es)</para>
+          <indexterm zone="ch-system-libcap getpcaps">
+            <primary sortas="b-getpcaps">getpcaps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getcap">
+        <term><command>getcap</command></term>
+        <listitem>
+          <para>Wxamines file capabilities</para>
+          <indexterm zone="ch-system-libcap getcap">
+            <primary sortas="b-getcap">getcap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcap">
+        <term><filename class="libraryfile">libcap</filename></term>
+        <listitem>
+          <para>Library for setting and clearing POSIX.1e capabilities</para>
+          <indexterm zone="ch-system-libcap libcap">
+            <primary sortas="c-libcap">libcap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/common/udev.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -30,5 +30,6 @@
 <screen os="b"><userinput>./configure --prefix=/usr \
   --exec-prefix="" --sysconfdir=/etc \
-  --libexecdir=/lib/udev --libdir=/usr/lib \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
   --disable-extras --disable-introspection</userinput></screen>
 
@@ -45,4 +46,25 @@
 
 <screen os="j"><userinput>install -dv /lib/firmware</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="conf-udev" role="configuration">
+    <title>Configuring Udev</title>
+
+    <para>When systemd starts a tmpfs filesystem is mounted over
+    <filename class="directory">/dev</filename> and the previous entries are
+    no-longer available. The folling command creates files that are copied
+    over when udevd starts:</para>
+
+<screen><userinput>mkdir -pv /lib/udev/devices/{pts,shm}
+mknod -m 0600 /lib/udev/devices/console c 5 1
+mknod -m 0666 /lib/udev/devices/null c 1 3
+mknod -m 0666 /lib/udev/devices/zero c 1 5
+mknod -m 0600 /lib/udev/devices/kmsg c 1 11
+ln -snvf /proc/self/fd /lib/udev/devices/fd
+ln -snvf /proc/self/fd/0 /lib/udev/devices/stdin
+ln -snvf /proc/self/fd/1 /lib/udev/devices/stdout
+ln -snvf /proc/self/fd/2 /lib/udev/devices/stderr
+ln -snvf /proc/kcore /lib/udev/devices/core</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/common/util-linux.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -93,10 +93,4 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>logger</command> binary to
-    <filename class="directory">/bin</filename> as it is needed by the
-    CLFS-Bootscripts package:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/mips-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -43,4 +43,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
@@ -58,11 +59,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -43,4 +43,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
@@ -58,11 +59,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/mips64-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -39,4 +39,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/gcc.xml"/>
@@ -75,5 +76,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
@@ -97,4 +100,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
@@ -102,8 +108,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
Index: BOOK/final-system/multilib/attr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/attr-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/attr-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-attr" role="wrap">
+  <?dbhtml attrname="attr-64bit.html"?>
+
+  <title>Attr-&attr-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-attr">
+    <primary sortas="a-Attr">Attr</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Attr</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure \
+    --prefix=/usr --libdir=/lib64 \
+    --libexecdir=/usr/lib64</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="i"><userinput>rm -v /lib64/libattr.{,l}a</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>chmod 755 -v /lib64/libattr.so.1.1.0</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(id('contents-attr'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/attr-n32.xml
===================================================================
--- BOOK/final-system/multilib/attr-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/attr-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-attr-n32" role="wrap">
+  <?dbhtml attrname="attr-n32.html"?>
+
+  <title>Attr-&attr-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-attr-n32">
+    <primary sortas="a-Attr">Attr</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Attr</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure \
+    --prefix=/usr --libdir=/lib32 \
+    --libexecdir=/usr/lib32</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="i"><userinput>rm -v /lib32/libattr.{,l}a</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+<screen os="k"><userinput>chmod 755 -v /lib32/libattr.so.1.1.0</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-attr" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/attr.xml
===================================================================
--- BOOK/final-system/multilib/attr.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/attr.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-attr-32" role="wrap">
+  <?dbhtml attrname="attr.html"?>
+
+  <title>Attr-&attr-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-attr-32">
+    <primary sortas="a-Attr">Attr</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Attr</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure \
+    --prefix=/usr --libdir=/lib \
+    --libexecdir=/usr/lib</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-attr" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/coreutils.xml
===================================================================
--- BOOK/final-system/multilib/coreutils.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/multilib/coreutils.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -106,12 +106,4 @@
     xpointer="xpointer(//*[@os='u'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
   </sect2>
 
Index: BOOK/final-system/multilib/dbus-64bit.xml
===================================================================
--- BOOK/final-system/multilib/dbus-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/dbus-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-dbus" role="wrap">
+  <?dbhtml filename="dbus-64bit.html"?>
+
+  <title>D-Bus-&dbus-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-dbus">
+    <primary sortas="a-D-Bus">D-Bus</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/dbus.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of D-Bus</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" USE_ARCH=64 \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libdir=/usr/lib64 --libexecdir=/usr/lib/dbus-1.0 \
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/dbus.xml"
+  xpointer="xpointer(id('contents-dbus'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/dbus-n32.xml
===================================================================
--- BOOK/final-system/multilib/dbus-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/dbus-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-dbus-n32" role="wrap">
+  <?dbhtml filename="dbus-n32.html"?>
+
+  <title>D-Bus-&dbus-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-dbus-n32">
+    <primary sortas="a-D-Bus">D-Bus</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/dbus.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of D-Bus</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" USE_ARCH=n32 \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libdir=/usr/lib32 --libexecdir=/usr/lib/dbus-1.0 \
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-dbus" role="."/></para>
+
+  </sect2>
+</sect1>
+
+
+
Index: BOOK/final-system/multilib/dbus.xml
===================================================================
--- BOOK/final-system/multilib/dbus.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/dbus.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-dbus-32" role="wrap">
+  <?dbhtml filename="dbus.html"?>
+
+  <title>D-Bus-&dbus-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-dbus-32">
+    <primary sortas="a-D-Bus">D-Bus 32 Bit Libraries</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/dbus.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of D-Bus</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" USE_ARCH=32 \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-dbus" role="."/></para>
+
+  </sect2>
+</sect1>
+
Index: BOOK/final-system/multilib/expat-64bit.xml
===================================================================
--- BOOK/final-system/multilib/expat-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/expat-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-expat" role="wrap">
+  <?dbhtml expatname="expat-64bit.html"?>
+
+  <title>Expat-&expat-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-expat">
+    <primary sortas="a-Expat">Expat</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expat.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expat.xml"
+  xpointer="xpointer(id('contents-expat'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/expat-n32.xml
===================================================================
--- BOOK/final-system/multilib/expat-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/expat-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-expat-n32" role="wrap">
+  <?dbhtml expatname="expat-n32.html"?>
+
+  <title>Expat-&expat-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-expat-n32">
+    <primary sortas="a-Expat">Expat</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expat.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib32</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-expat" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/expat.xml
===================================================================
--- BOOK/final-system/multilib/expat.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/expat.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-expat-32" role="wrap">
+  <?dbhtml expatname="expat.html"?>
+
+  <title>Expat-&expat-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-expat-32">
+    <primary sortas="a-Expat">Expat</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expat.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+    --libdir=/usr/lib</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-expat" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/libcap-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libcap-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/libcap-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libcap" role="wrap">
+  <?dbhtml libcapname="libcap-64bit.html"?>
+
+  <title>Libcap-&libcap-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-libcap">
+    <primary sortas="a-Libcap">Libcap</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/libcap.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libcap</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>make lib=lib64 install
+chmod -v 755 /lib64/libcap.so.&libcap-version;
+rm /lib64/libcap.so
+ln -sfv ../../lib64/libcap.so.2 /usr/lib64/libcap.so
+mv -v /lib64/libcap.a /usr/lib64</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/libcap.xml"
+  xpointer="xpointer(id('contents-libcap'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/libcap-n32.xml
===================================================================
--- BOOK/final-system/multilib/libcap-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/libcap-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libcap-n32" role="wrap">
+  <?dbhtml libcapname="libcap-n32.html"?>
+
+  <title>Libcap-&libcap-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-libcap-n32">
+    <primary sortas="a-Libcap">Libcap</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/libcap.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libcap</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="e"><userinput>make lib=lib32 install
+chmod -v 755 /lib32/libcap.so.&libcap-version;
+rm /lib32/libcap.so
+ln -sfv ../../lib32/libcap.so.2 /usr/lib32/libcap.so
+mv -v /lib32/libcap.a /usr/lib32</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-libcap" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/libcap.xml
===================================================================
--- BOOK/final-system/multilib/libcap.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
+++ BOOK/final-system/multilib/libcap.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libcap-32" role="wrap">
+  <?dbhtml libcapname="libcap.html"?>
+
+  <title>Libcap-&libcap-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-libcap-32">
+    <primary sortas="a-Libcap">Libcap</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/libcap.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Libcap</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-libcap" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/udev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/udev-64bit.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/multilib/udev-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -27,6 +27,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-  --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
-  --libdir=/usr/lib64 --disable-extras --disable-introspection</userinput></screen>
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib64 --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -58,4 +60,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/udev.xml"
+  xpointer="xpointer(id('conf-udev'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/udev.xml"
   xpointer="xpointer(id('contents-udev'))"/>
 
Index: BOOK/final-system/multilib/udev-n32.xml
===================================================================
--- BOOK/final-system/multilib/udev-n32.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/multilib/udev-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -26,7 +26,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}"./configure --prefix=/usr \
-  --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
-  --libdir=/usr/lib32 --disable-extras --disable-introspection</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib32 --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/udev.xml
===================================================================
--- BOOK/final-system/multilib/udev.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/multilib/udev.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -27,6 +27,8 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
-  --exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
-  --libdir=/usr/lib --disable-extras --disable-introspection</userinput></screen>
+  --exec-prefix="" --sysconfdir=/etc \
+  --sbindir=/sbin --libexecdir=/lib/udev \
+  --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
+  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/util-linux-64bit.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/multilib/util-linux-64bit.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -57,12 +57,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
Index: BOOK/final-system/multilib/util-linux-n32.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-n32.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/multilib/util-linux-n32.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -54,12 +54,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
Index: BOOK/final-system/multilib/util-linux.xml
===================================================================
--- BOOK/final-system/multilib/util-linux.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/multilib/util-linux.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -54,12 +54,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/ppc-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -43,4 +43,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
@@ -58,11 +59,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/ppc64-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -60,4 +60,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
@@ -78,12 +80,19 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/sparc-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -43,4 +43,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
@@ -58,11 +59,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -43,4 +43,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
@@ -58,11 +59,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -60,4 +60,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
@@ -78,12 +80,19 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/x86-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -43,4 +43,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
@@ -58,11 +59,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -43,4 +43,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
@@ -58,11 +59,15 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/final-system/x86_64-chapter.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -60,4 +60,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/attr-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
@@ -78,12 +80,19 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
+<!-- systemd -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/introduction/common/changelog.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -48,6 +48,27 @@
 
     <listitem>
+      <para>February 6, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Add Expat 2.0.1.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Add D-Bus 1.4.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 30, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Add systemd 17.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Add libcap 2.19.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Add Attr 2.4.44.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Add Pkg-config 0.25.</para>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/materials/common/packages.xml	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -16,4 +16,13 @@
 
     <varlistentry>
+      <term>Attr (&attr-version;) - <token>&attr-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&attr-home;"/></para>
+        <para>Download: <ulink url="&attr-url;"/></para>
+        <para>MD5 sum: <literal>&attr-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
       <listitem>
@@ -97,4 +106,13 @@
 
     <varlistentry>
+      <term>D-Bus (&dbus-version;) - <token>&dbus-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&dbus-home;"/></para>
+        <para>Download: <ulink url="&dbus-url;"/></para>
+        <para>MD5 sum: <literal>&dbus-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
       <listitem>
@@ -138,4 +156,13 @@
         <para>Download: <ulink url="&e2fsprogs-url;"/></para>
         <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Expat (&expat-version;) - <token>&expat-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&expat-home;"/></para>
+        <para>Download: <ulink url="&expat-url;"/></para>
+        <para>MD5 sum: <literal>&expat-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -295,4 +322,13 @@
 
     <varlistentry>
+      <term>Libcap (&libcap-version;) - <token>&libcap-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libcap-home;"/></para>
+        <para>Download: <ulink url="&libcap-url;"/></para>
+        <para>MD5 sum: <literal>&libcap-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
       <listitem>
@@ -484,4 +520,13 @@
 
     <varlistentry>
+      <term>systemd (&systemd-version;) - <token>&systemd-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&systemd-home;"/></para>
+        <para>Download: <ulink url="&systemd-url;"/></para>
+        <para>MD5 sum: <literal>&systemd-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Tar (&tar-version;) - <token>&tar-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/packages.ent	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -11,4 +11,10 @@
 <!ENTITY aboot-md5 "5f16edbf4e9d52cd191adc4d4b6a5327">
 <!ENTITY aboot-home "http://sourceforge.net/projects/aboot">
+
+<!ENTITY attr-version "2.4.44">
+<!ENTITY attr-size "312 KB">
+<!ENTITY attr-url "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
+<!ENTITY attr-md5 "d132c119831c27350e10b9f885711adc">
+<!ENTITY attr-home "http://acl.bestbits.at/">
 
 <!ENTITY arcload-version "0.5">
@@ -78,4 +84,10 @@
 <!ENTITY coreutils-md5 "36909ae68840d73a800120cf74af794a">
 <!ENTITY coreutils-home "&gnu-software;coreutils">
+
+<!ENTITY dbus-version "1.4.1">
+<!ENTITY dbus-size "1,808 KB">
+<!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
+<!ENTITY dbus-md5 "99cb057700c0455fb68f8d57902f77ac">
+<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
 
 <!ENTITY dejagnu-version "1.4.4">
@@ -130,4 +142,10 @@
 <!ENTITY elftoaout-home " ">
 
+<!ENTITY expat-version "2.0.1">
+<!ENTITY expat-size "436 KB">
+<!ENTITY expat-url "&sourceforge;expat/expat-2.0.1.tar.gz">
+<!ENTITY expat-md5 "ee8b492592568805593f81f8cdf2a04c">
+<!ENTITY expat-home " ">
+
 <!ENTITY expect-version "5.45">
 <!ENTITY expect-size "616 KB">
@@ -242,4 +260,10 @@
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less">
 
+<!ENTITY libcap-version "2.20">
+<!ENTITY libcap-size "52 KB">
+<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.bz2">
+<!ENTITY libcap-md5 "10e47ed32ca2214eb0e58780282d27b4">
+<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
+
 <!ENTITY libtool-version "2.4">
 <!ENTITY libtool-size "836 KB">
@@ -388,4 +412,10 @@
 <!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
 <!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
+
+<!ENTITY systemd-version "17">
+<!ENTITY systemd-size "738 KB">
+<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.bz2">
+<!ENTITY systemd-md5 "ae69109af0628c083846b8aea921692c">
+<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
 
 <!ENTITY tar-version "1.25">
Index: BOOK/users_groups.ent
===================================================================
--- BOOK/users_groups.ent	(revision 6d1db7d24d91f671c539e905cbe95b395561913a)
+++ BOOK/users_groups.ent	(revision 2b687ad3e96a0c7538f80b2d7ff099c601c04952)
@@ -8,4 +8,5 @@
 <!ENTITY uid-adm "3">
 <!ENTITY uid-lp "10">
+<!ENTITY uid-messagebus "27">
 <!ENTITY uid-mail "30">
 <!ENTITY uid-news "31">
@@ -35,4 +36,5 @@
 <!ENTITY gid-console "17">
 <!ENTITY gid-cdrw "18">
+<!ENTITY gid-messagebus "27">
 <!ENTITY gid-mail "30">
 <!ENTITY gid-news "31">
