Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/appendices/dependencies/common.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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>
@@ -337,4 +365,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>
@@ -444,4 +500,32 @@
         <seglistitem>
           <seg>None</seg>
+        </seglistitem>
+      </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>
@@ -1005,34 +1089,33 @@
       </segmentedlist>
 
-<!-- Begin libestr dependency info -->
-  <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Libestr, Make, Pkg-config-lite, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Rsyslog</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin libestr dependency info -->
-  <bridgehead renderas="sect2" id="libestr-dep">Libestr</bridgehead>
+<!-- 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>
 
       <segmentedlist>
@@ -1049,32 +1132,4 @@
 
         <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Libee and Rsyslog</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Libtool dependency info -->
-  <bridgehead renderas="sect2" id="libtool-dep">Libtool</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
           <seg>Autoconf</seg>
         </seglistitem>
@@ -1224,5 +1279,5 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>D-Bus</seg>
         </seglistitem>
       </segmentedlist>
@@ -1447,5 +1502,5 @@
 
         <seglistitem>
-          <seg>Util-linux, E2fsprogs</seg>
+          <seg>E2fsprogs, Pkg-config, systemd, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
@@ -1534,32 +1589,4 @@
       </segmentedlist>
 
-<!-- Begin Rsyslog dependency info -->
-  <bridgehead renderas="sect2" id="rsyslog-dep">Rsyslog</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, libee,
-         Libestr, Make, Sed and Zlib</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 Sed dependency info -->
   <bridgehead renderas="sect2" id="sed-dep">Sed</bridgehead>
@@ -1618,4 +1645,33 @@
       </segmentedlist>
 
+<!-- Begin systemd dependency info -->
+  <bridgehead renderas="sect2" id="systemd-dep">systemd</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, D-Bus, E2fsprogs, EGLIBC, Findutils, Gawk,
+         GCC, GPerf, Grep, Intltool, Libcap, Make, Perl, Pkg-config, Sed,
+         Util-linux and XML-Parser</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>
@@ -1753,5 +1809,5 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>systemd</seg>
         </seglistitem>
       </segmentedlist>
@@ -1781,5 +1837,5 @@
 
         <seglistitem>
-          <seg>E2fsprogs</seg>
+          <seg>E2fsprogs, systemd</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/rationale/common.xml
===================================================================
--- BOOK/appendices/rationale/common.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/appendices/rationale/common.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -228,16 +228,4 @@
 
     <listitem>
-      <para>Libee</para>
-      <para>This package contains an event expression library. It is needed by
-      Rsyslog.</para>
-    </listitem>
-
-    <listitem>
-      <para>Libestr</para>
-      <para>This package contains a library for string essentials. It is needed
-      by Rsyslog.</para>
-    </listitem>
-
-    <listitem>
       <para>Libtool</para>
       <para>The Libtool package contains the GNU generic library support
@@ -329,12 +317,4 @@
 
     <listitem>
-      <para>Rsyslog</para>
-      <para>Rsyslog is an enhanced multi-threaded syslogd that supports
-      multiple backends with very little dependencies. It provides a program
-      that logs various system events into files in
-      <filename class="directory">/var/log</filename>.</para>
-    </listitem>
-
-    <listitem>
       <para>Sed</para>
       <para>This package contains a stream editor. It is used in the
Index: BOOK/boot/64/eudev.xml
===================================================================
--- BOOK/boot/64/eudev.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/64/eudev.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -17,5 +17,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/eudev.xml"
+  href="../common/eudev.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
@@ -24,5 +24,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -37,13 +37,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -53,5 +53,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='r1'])"/>
 
@@ -62,11 +62,7 @@
  </sect2>
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-eudev" role="."/></para>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
 
 </sect1>
Index: BOOK/boot/alpha-chapter.xml
===================================================================
--- BOOK/boot/alpha-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/alpha-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -26,5 +26,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: OK/boot/common/bootscripts.xml
===================================================================
--- BOOK/boot/common/bootscripts.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?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-scripts-boot" role="wrap">
-  <?dbhtml filename="bootscripts.html"?>
-
-  <title>Bootscripts for CLFS &bootscripts-clfs-version;</title>
-
-  <indexterm zone="ch-scripts-boot">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../bootscripts/common/bootscripts.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bootscripts</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootscripts/common/bootscripts.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make DESTDIR=${CLFS} install-minimal</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootscripts/common/setclock.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="c">If you do not know whether or not the hardware clock is set to UTC,
-    you can find out after you have booted the new machine by running the
-    <userinput>hwclock --localtime  --show</userinput> command, and if
-    necessary editing the <filename>/etc/sysconfig/clock</filename> script.
-    The worst that will happen if you make a wrong guess here is that the
-    time displayed will be wrong.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../bootscripts/common/setclock.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat &gt; ${CLFS}/etc/sysconfig/clock &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/clock
-
-UTC=1
-
-# End /etc/sysconfig/clock</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-  <para>Details on this package are located in <xref
-  linkend="contents-bootscripts" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/common/devices.xml
===================================================================
--- BOOK/boot/common/devices.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/common/devices.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -36,14 +36,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
+    <para>When systemd starts a tmpfs filesystem is mounted over
     <filename class="directory">/dev</filename> and the previous entries are
-    no longer available. The following command creates files that are copied
-    over by the udev bootscript:</para>
+    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/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/common/eudev.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -16,14 +16,16 @@
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/eudev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
+  <sect2 role="package">
+    <title/>
+
+    <para>The Eudev package contains programs for dynamic creation of device
+    nodes.</para>
+
+  </sect2>
 
   <sect2 role="installation">
     <title>Installation of Eudev</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+   <para os="a">Prepare Eudev for compilation:</para>
 
 <screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
@@ -37,27 +39,18 @@
     --enable-libkmod</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="g">Install the package:</para>
 
 <screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    <para os="i">Create a directory for storing firmware that can be
+    loaded by <command>udev</command>:</para>
 
 <screen os="k"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
+    <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
 
 <screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \
@@ -66,9 +59,220 @@
  </sect2>
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-eudev" role="."/></para>
+  <sect2 id="contents-eudev" role="content">
+    <title>Contents of Eudev</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
+        firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, usb_id,
+        v4l_id, write_cd_rules, write_net_rules</seg>
+        <seg>libudev</seg>
+        <seg>/etc/udev, /lib/firmware, /lib/udev, /usr/share/doc/udev</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="udevadm">
+        <term><command>udevadm</command></term>
+        <listitem>
+        <para>Controls the runtime behavior of Eudev, requests kernel
+        events, manages the event queue, and provides simple debugging.</para>
+          <indexterm zone="ch-boot-eudev udevadm">
+            <primary sortas="b-udevadm">udevadm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevd">
+        <term><command>udevd</command></term>
+        <listitem>
+          <para>A daemon that reorders hotplug events before submitting them to
+          <command>udev</command>,
+          thus avoiding various race conditions</para>
+          <indexterm zone="ch-boot-eudev udevd">
+            <primary sortas="b-udevd">udevd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+ <!-- Start of Helpers -->
+      <varlistentry id="ata_id">
+        <term><command>ata_id</command></term>
+        <listitem>
+          <para>Provides Eudev with a unique string and additional
+          information (uuid, label) for an ATA drive</para>
+          <indexterm zone="ch-boot-eudev ata_id">
+            <primary sortas="b-ata_id">ata_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cdrom_id">
+        <term><command>cdrom_id</command></term>
+        <listitem>
+          <para>Prints the capabilities of a CDROM or DVDROM drive.</para>
+          <indexterm zone="ch-boot-eudev cdrom_id">
+            <primary sortas="b-cdrom_id">cdrom_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="collect">
+        <term><command>collect</command></term>
+        <listitem>
+          <para>Given an ID for the current uevent and a list of IDs
+(for all target uevents), registers the current ID and indicates whether
+all target IDs have been registered.</para>
+          <indexterm zone="ch-boot-eudev collect">
+            <primary sortas="b-collect">collect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="create_floppy_devices">
+        <term><command>create_floppy_devices</command></term>
+        <listitem>
+          <para>Creates all possible floppy devices based on the CMOS type</para>
+          <indexterm zone="ch-boot-eudev create_floppy_devices">
+            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="edd_id">
+        <term><command>edd_id</command></term>
+        <listitem>
+          <para>Identifies x86 disk drives from Enhanced Disk Drive calls</para>
+          <indexterm zone="ch-boot-eudev edd_id">
+            <primary sortas="b-edd_id">edd_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="firmware.sh">
+        <term><command>firmware.sh</command></term>
+        <listitem>
+          <para>Script to load firmware for a device</para>
+          <indexterm zone="ch-boot-eudev firmware.sh">
+            <primary sortas="b-firmware.sh">firmware.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fstab_import">
+        <term><command>fstab_import</command></term>
+        <listitem>
+          <para>Finds an entry in <filename>/etc/fstab</filename> that matches
+the current device, and provides its information to Udev.</para>
+          <indexterm zone="ch-boot-eudev fstab_import">
+            <primary sortas="b-fstab_import">fstab_import</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="path_id">
+        <term><command>path_id</command></term>
+        <listitem>
+          <para>Provides the shortest possible unique hardware path to a
+          device</para>
+          <indexterm zone="ch-boot-eudev path_id">
+            <primary sortas="b-path_id">path_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="scsi_id">
+        <term><command>scsi_id</command></term>
+        <listitem>
+          <para>Retrieves or generates a unique SCSI identifier.</para>
+          <indexterm zone="ch-boot-eudev scsi_id">
+            <primary sortas="b-scsi_id">scsi_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="usb_id">
+        <term><command>usb_id</command></term>
+        <listitem>
+          <para>Identifies a USB block device.</para>
+          <indexterm zone="ch-boot-eudev usb_id">
+            <primary sortas="b-usb_id">usb_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="v4l_id">
+        <term><command>v4l_id</command></term>
+        <listitem>
+          <para>Determines V4L capabilities for a given device.</para>
+          <indexterm zone="ch-boot-eudev v4l_id">
+            <primary sortas="b-v4l_id">v4l_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write_cd_rules">
+        <term><command>write_cd_rules</command></term>
+        <listitem>
+          <para>A script which generates Eudev rules to provide stable names
+for network interfaces.</para>
+          <indexterm zone="ch-boot-eudev write_cd_rules">
+            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write_net_rules">
+        <term><command>write_net_rules</command></term>
+        <listitem>
+          <para>A script which generates Eudev rules to provide stable names
+for network interfaces.</para>
+          <indexterm zone="ch-boot-eudev write_net_rules">
+            <primary sortas="b-write_net_rules">write_net_rules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+<!-- End of Helpers -->
+
+      <varlistentry id="libudev">
+        <term><filename class="libraryfile">libudev</filename></term>
+        <listitem>
+          <para>A library interface to eudev device information.</para>
+          <indexterm zone="ch-boot-eudev libudev">
+            <primary sortas="c-libudev">libudev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="etc-eudev">
+        <term><filename class="directory">/etc/udev</filename></term>
+        <listitem>
+          <para>Contains <command>udev</command> configuration files,
+          device permissions, and rules for device naming</para>
+          <indexterm zone="ch-boot-eudev etc-eudev">
+            <primary sortas="e-/etc/udev">/etc/udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lib-eudev">
+        <term><filename class="directory">/lib/udev</filename></term>
+        <listitem>
+          <para>Contains <command>udev</command> helper programs
+          and static devices which get copied to /dev when booted.</para>
+          <indexterm zone="ch-boot-eudev lib-eudev">
+            <primary sortas="e-/lib/udev">/lib/udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
   </sect2>
Index: BOOK/boot/common/pwdgroup.xml
===================================================================
--- BOOK/boot/common/pwdgroup.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/common/pwdgroup.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,5 +44,6 @@
 
 <screen><userinput>cat &gt; ${CLFS}/etc/passwd &lt;&lt; "EOF"
-<literal>root::&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
+<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/boot/common/sysvinit.xml
===================================================================
--- BOOK/boot/common/sysvinit.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/common/sysvinit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -16,7 +16,11 @@
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
+  <sect2 role="package">
+    <title/>
+
+    <para>The Sysvinit package contains programs for controlling the startup,
+    running, and shutdown of the system.</para>
+
+  </sect2>
 
   <sect2 role="installation">
@@ -30,14 +34,10 @@
     src/Makefile.orig > src/Makefile</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    <para os ="c">Compile the package:</para>
 
 <screen os="ac"><userinput>make -C src clobber
 make -C src CC="${CC}"</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+   <para os="e">Install the package:</para>
 
 <screen os="ad"><userinput>make -C src ROOT=${CLFS} install</userinput></screen>
@@ -109,11 +109,157 @@
 EOF</userinput></screen>
 
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
+    <para>The <parameter>-I '\033(K'</parameter> option tells
+    <command>agetty</command> to send this escape sequence to the terminal
+    before doing anything else. This escape sequence switches the console
+    character set to a user-defined one, which can be modified by running
+    the <command>setfont</command> program. The <command>console</command>
+    initscript from the CLFS-Bootscripts package calls the
+    <command>setfont</command> program during system startup. Sending this
+    escape sequence is necessary for people who use non-ISO 8859-1 screen
+    fonts, but it does not affect native English speakers.</para>
+
+  </sect2>
+
+  <sect2 id="contents-sysvinit" role="content">
+    <title>Contents of Sysvinit</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>bootlogd, fstab-decode, halt, init, killall5, pidof (link to
+        killall5), poweroff (link to halt), reboot (link to halt), runlevel,
+        shutdown, and telinit (link to init)</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="bootlogd">
+        <term><command>bootlogd</command></term>
+        <listitem>
+          <para>Logs boot messages to a log file</para>
+          <indexterm zone="ch-boot-sysvinit bootlogd">
+            <primary sortas="b-bootlogd">bootlogd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fstab-decode">
+        <term><command>fstab-decode</command></term>
+        <listitem>
+          <para>Runs a command with fstab-encoded arguments</para>
+          <indexterm zone="ch-boot-sysvinit fstab-decode">
+            <primary sortas="b-fstab-decode">fstab-decode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="halt">
+        <term><command>halt</command></term>
+        <listitem>
+          <para>Normally invokes <command>shutdown</command> with the
+          <parameter>-h</parameter> option, except when already in run-level 0,
+          then it tells the kernel to halt the system; it notes in the
+          file <filename>/var/log/wtmp</filename> that the system is being
+          brought down</para>
+          <indexterm zone="ch-boot-sysvinit halt">
+            <primary sortas="b-halt">halt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="init">
+        <term><command>init</command></term>
+        <listitem>
+          <para>The first process to be started when the kernel has initialized
+          the hardware which takes over the boot process and starts all the
+          proceses it is instructed to</para>
+          <indexterm zone="ch-boot-sysvinit init">
+            <primary sortas="b-init">init</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="killall5">
+        <term><command>killall5</command></term>
+        <listitem>
+          <para>Sends a signal to all processes, except the processes in its own
+          session so it will not kill the shell running the script that called
+          it</para>
+          <indexterm zone="ch-boot-sysvinit killall5">
+            <primary sortas="b-killall5">killall5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pidof">
+        <term><command>pidof</command></term>
+        <listitem>
+          <para>Reports the PIDs of the given programs</para>
+          <indexterm zone="ch-boot-sysvinit pidof">
+            <primary sortas="b-pidof">pidof</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="poweroff">
+        <term><command>poweroff</command></term>
+        <listitem>
+          <para>Tells the kernel to halt the system and switch off the computer
+          (see <command>halt</command>)</para>
+          <indexterm zone="ch-boot-sysvinit poweroff">
+            <primary sortas="b-poweroff">poweroff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="reboot">
+        <term><command>reboot</command></term>
+        <listitem>
+          <para>Tells the kernel to reboot the system (see
+          <command>halt</command>)</para>
+          <indexterm zone="ch-boot-sysvinit reboot">
+            <primary sortas="b-reboot">reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="runlevel">
+        <term><command>runlevel</command></term>
+        <listitem>
+          <para>Reports the previous and the current run-level, as noted in
+          the last run-level record in <filename>/var/run/utmp</filename></para>
+          <indexterm zone="ch-boot-sysvinit runlevel">
+            <primary sortas="b-runlevel">runlevel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="shutdown">
+        <term><command>shutdown</command></term>
+        <listitem>
+          <para>Brings the system down in a secure way, signaling all processes
+          and notifying all logged-in users</para>
+          <indexterm zone="ch-boot-sysvinit shutdown">
+            <primary sortas="b-shutdown">shutdown</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="telinit">
+        <term><command>telinit</command></term>
+        <listitem>
+          <para>Tells <command>init</command> which run-level to change to</para>
+          <indexterm zone="ch-boot-sysvinit telinit">
+            <primary sortas="b-telinit">telinit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
   </sect2>
Index: BOOK/boot/mips-chapter.xml
===================================================================
--- BOOK/boot/mips-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/mips-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -27,5 +27,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/mips64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/mips64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/multilib/eudev.xml
===================================================================
--- BOOK/boot/multilib/eudev.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/multilib/eudev.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -17,5 +17,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/eudev.xml"
+  href="../common/eudev.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
@@ -24,5 +24,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -38,13 +38,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -54,5 +54,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='r1'])"/>
 
@@ -63,11 +63,7 @@
   </sect2>
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-eudev" role="."/></para>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
 
 </sect1>
Index: BOOK/boot/multilib/sysvinit.xml
===================================================================
--- BOOK/boot/multilib/sysvinit.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/multilib/sysvinit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -17,5 +17,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/sysvinit.xml"
+  href="../common/sysvinit.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
@@ -52,11 +52,3 @@
   xpointer="xpointer(//*[@role='configuration'])"/>
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
 </sect1>
Index: BOOK/boot/ppc-chapter.xml
===================================================================
--- BOOK/boot/ppc-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/ppc-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/ppc64-64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/ppc64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -29,5 +29,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/ppc64-64/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc64-64/powerpc-utils.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/ppc64-64/powerpc-utils.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -27,7 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+  --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/2001/XInclude"
Index: BOOK/boot/ppc64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/ppc64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -31,5 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/ppc64/util-linux-32.xml
===================================================================
--- BOOK/boot/ppc64/util-linux-32.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/ppc64/util-linux-32.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -27,9 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG= \
-  ./configure \
-    --prefix=/tools --exec-prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET32} \
-    --without-ncurses --disable-makeinstall-chown</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/2001/XInclude"
Index: BOOK/boot/sparc-chapter.xml
===================================================================
--- BOOK/boot/sparc-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/sparc-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -27,5 +27,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/sparc64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -28,5 +28,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/x86-chapter.xml
===================================================================
--- BOOK/boot/x86-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/x86-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
@@ -26,5 +26,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -27,5 +27,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/boot/x86_64-64/eudev.xml
===================================================================
--- BOOK/boot/x86_64-64/eudev.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/x86_64-64/eudev.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -17,5 +17,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/eudev.xml"
+  href="../common/eudev.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
@@ -24,5 +24,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -37,13 +37,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -53,5 +53,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
@@ -59,5 +59,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eudev.xml"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='r1'])"/>
 
@@ -68,11 +68,7 @@
   </sect2>
 
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-eudev" role="."/></para>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/eudev.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
 
 </sect1>
Index: BOOK/boot/x86_64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/boot/x86_64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -27,5 +27,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
Index: BOOK/bootable/common/fstab.xml
===================================================================
--- BOOK/bootable/common/fstab.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootable/common/fstab.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -28,10 +28,4 @@
 /dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
 /dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
-proc           /proc        proc   defaults         0     0
-sysfs          /sys         sysfs  defaults         0     0
-devpts         /dev/pts     devpts gid=&gid-tty;,mode=620   0     0
-shm            /dev/shm     tmpfs  defaults         0     0
-tmpfs          /run         tmpfs  defaults         0     0
-devtmpfs       /dev         devtmpfs mode=0755,nosuid 0     0
 
 # End /etc/fstab</literal>
Index: BOOK/bootscripts/alpha-chapter.xml
===================================================================
--- BOOK/bootscripts/alpha-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/alpha-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: OK/bootscripts/common/bootscripts.xml
===================================================================
--- BOOK/bootscripts/common/bootscripts.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,278 +1,0 @@
-<?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-scripts-bootscripts" role="wrap">
-  <?dbhtml filename="bootscripts.html"?>
-
-  <title>Bootscripts for CLFS &bootscripts-clfs-version;</title>
-
-  <indexterm zone="ch-scripts-bootscripts">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bootscripts package contains a set of scripts to
-    start/stop the CLFS system at bootup/shutdown.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bootscripts</title>
-
-    <para os="a">Install the package:</para>
-
-<screen os="b"><userinput>make install-bootscripts</userinput></screen>
-
-    <para os="c">You can will need to run the following command to install support for Networking:</para>
-
-<screen os="d"><userinput>make install-network</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-bootscripts" role="content">
-    <title>Contents of Bootscripts</title>
-
-    <segmentedlist>
-      <segtitle>Installed scripts</segtitle>
-
-      <seglistitem>
-        <seg>checkfs, cleanfs, console, functions, halt, ifdown,
-        ifup, localnet, mountfs, mountkernfs, network, rc, reboot, sendsignals,
-        setclock, static, swap, sysklogd, template, and udev.</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="checkfs-bootscripts">
-        <term><command>checkfs</command></term>
-        <listitem>
-          <para>Checks the integrity of the file systems before they are
-          mounted (with the exception of journal and network based file
-          systems)</para>
-          <indexterm zone="ch-scripts-bootscripts checkfs-bootscripts">
-            <primary sortas="d-checkfs">checkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cleanfs-bootscripts">
-        <term><command>cleanfs</command></term>
-        <listitem>
-          <para>Removes files that should not be preserved between reboots,
-          such as those in <filename class="directory">/var/run/</filename>
-          and <filename class="directory">/var/lock/</filename>; it re-creates
-          <filename>/var/run/utmp</filename> and removes the possibly present
-          <filename>/etc/nologin</filename>, <filename>/fastboot</filename>,
-          and <filename>/forcefsck</filename> files</para>
-          <indexterm zone="ch-scripts-bootscripts cleanfs-bootscripts">
-            <primary sortas="d-cleanfs">cleanfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="console-bootscripts">
-        <term><command>console</command></term>
-        <listitem>
-          <para>Loads the correct keymap table for the desired keyboard
-          layout; it also sets the screen font</para>
-          <indexterm zone="ch-scripts-bootscripts console-bootscripts">
-            <primary sortas="d-console">console</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="functions-bootscripts">
-        <term><command>functions</command></term>
-        <listitem>
-          <para>Contains common functions, such as error and status checking,
-          that are used by several bootscripts</para>
-          <indexterm zone="ch-scripts-bootscripts functions-bootscripts">
-            <primary sortas="d-functions">functions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt-bootscripts">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Halts the system</para>
-          <indexterm zone="ch-scripts-bootscripts halt-bootscripts">
-            <primary sortas="d-halt">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifdown-bootscripts">
-        <term><command>ifdown</command></term>
-        <listitem>
-          <para>Assists the network script with stopping network devices</para>
-          <indexterm zone="ch-scripts-bootscripts ifdown-bootscripts">
-            <primary sortas="d-ifdown">ifdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifup-bootscripts">
-        <term><command>ifup</command></term>
-        <listitem>
-          <para>Assists the network script with starting network devices</para>
-          <indexterm zone="ch-scripts-bootscripts ifup-bootscripts">
-            <primary sortas="d-ifup">ifup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localnet-bootscripts">
-        <term><command>localnet</command></term>
-        <listitem>
-          <para>Sets up the system's hostname and local loopback device</para>
-          <indexterm zone="ch-scripts-bootscripts localnet-bootscripts">
-            <primary sortas="d-localnet">localnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountfs-bootscripts">
-        <term><command>mountfs</command></term>
-        <listitem>
-          <para>Mounts all file systems, except ones that are marked
-          <emphasis>noauto</emphasis> or are network based</para>
-          <indexterm zone="ch-scripts-bootscripts mountfs-bootscripts">
-            <primary sortas="d-mountfs">mountfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountkernfs-bootscripts">
-        <term><command>mountkernfs</command></term>
-        <listitem>
-          <para>Mounts virtual kernel file systems, such as
-          <systemitem class="filesystem">proc</systemitem></para>
-          <indexterm zone="ch-scripts-bootscripts mountkernfs-bootscripts">
-            <primary sortas="d-mountkernfs">mountkernfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="network-bootscripts">
-        <term><command>network</command></term>
-        <listitem>
-          <para>Sets up network interfaces, such as network cards, and sets up
-          the default gateway (where applicable)</para>
-          <indexterm zone="ch-scripts-bootscripts network-bootscripts">
-            <primary sortas="d-network">network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rc-bootscripts">
-        <term><command>rc</command></term>
-        <listitem>
-          <para>The master run-level control script; it is responsible for
-          running all the other bootscripts one-by-one, in a sequence
-          determined by the name of the symbolic links being processed</para>
-          <indexterm zone="ch-scripts-bootscripts rc-bootscripts">
-            <primary sortas="d-rc">rc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot-bootscripts">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Reboots the system</para>
-          <indexterm zone="ch-scripts-bootscripts reboot-bootscripts">
-            <primary sortas="d-reboot">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendsignals-bootscripts">
-        <term><command>sendsignals</command></term>
-        <listitem>
-          <para>Makes sure every process is terminated before the system reboots
-          or halts</para>
-          <indexterm zone="ch-scripts-bootscripts sendsignals-bootscripts">
-            <primary sortas="d-sendsignals">sendsignals</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setclock-bootscripts">
-        <term><command>setclock</command></term>
-        <listitem>
-          <para>Resets the kernel clock to local time in case the hardware clock
-          is not set to UTC time</para>
-          <indexterm zone="ch-scripts-bootscripts setclock-bootscripts">
-            <primary sortas="d-setclock">setclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="static-bootscripts">
-        <term><command>static</command></term>
-        <listitem>
-          <para>Provides the functionality needed to assign a static Internet
-          Protocol (IP) address to a network interface</para>
-          <indexterm zone="ch-scripts-bootscripts static-bootscripts">
-            <primary sortas="d-static">static</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swap-bootscripts">
-        <term><command>swap</command></term>
-        <listitem>
-          <para>Enables and disables swap files and partitions</para>
-          <indexterm zone="ch-scripts-bootscripts swap-bootscripts">
-            <primary sortas="d-swap">swap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sysklogd-bootscripts">
-        <term><command>sysklogd</command></term>
-        <listitem>
-          <para>Starts and stops the system and kernel log daemons</para>
-          <indexterm zone="ch-scripts-bootscripts sysklogd-bootscripts">
-            <primary sortas="d-sysklogd">sysklogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="template-bootscripts">
-        <term><command>template</command></term>
-        <listitem>
-          <para>A template to create custom bootscripts for other
-          daemons</para>
-          <indexterm zone="ch-scripts-bootscripts template-bootscripts">
-            <primary sortas="d-template">template</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eudev-bootscripts">
-        <term><command>udev</command></term>
-        <listitem>
-          <para>Starts and stops the Eudev daemon</para>
-          <indexterm zone="ch-scripts-bootscripts eudev-bootscripts">
-            <primary sortas="d-eudev">udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/bootscripts/common/console.xml
===================================================================
--- BOOK/bootscripts/common/console.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/common/console.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -14,27 +14,31 @@
   <secondary>configuring</secondary></indexterm>
 
-  <para>This section discusses how to configure the <command>i18n</command>
-  bootscript that sets up the keyboard map and the console font. If non-ASCII
-  characters (e.g., the British pound sign and Euro character) will not be
-  used and the keyboard is a U.S. one, skip this section. Without the
-  configuration file, the <command>console</command> bootscript will do
-  nothing.</para>
+  <para>This section discusses how to configure the
+  <filename>vconsole.conf</filename> file that sets up the keyboard map and the
+  console font. If non-ASCII characters (e.g., the British pound sign and Euro
+  character) will not be used and the keyboard is most likely a U.S. one. The
+  defaults in the file will probably be suitable for you.</para>
 
-  <para>The <command>i18n</command> script reads the
-  <filename>/etc/sysconfig/i18n</filename> file for configuration
-  information. Decide which keymap and screen font will be used. Various
-  language-specific HOWTO's can also help with this (see <ulink
-  url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. A pre-made
-  <filename>/etc/sysconfig/i18n</filename> file with known settings for
-  several countries was installed with the CLFS-Bootscripts package, so the
-  relevant section can be uncommented if the country is supported. If still
-  in doubt, look in the <filename class="directory">/usr/share/consolefonts</filename>
-  for valid screen fonts and <filename class="directory">/usr/share/keymaps</filename>
-  for valid keymaps.</para>
+  <para>The <filename>vconsole.conf</filename> file is read by the init system
+  and applied on startup. Decide which keymap and screen font will be used.
+  Various language-specific HOWTO's can also help with this (see
+  <ulink url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. Look in
+  <filename class="directory">/usr/share/consolefonts</filename> for valid
+  screen fonts and <filename class="directory">/usr/share/keymaps</filename> for
+  valid keymaps.</para>
 
-  <para>The default <filename>/etc/sysconfig/i18n</filename> is set up for UTF-8
-  using the us keymap. You will need to edit the file to your specific needs.
-  The <filename>/etc/sysconfig/i18n</filename> file has additional information
-  in it to help you to assist in configuring.</para>
+  <para>The default <filename>/etc/vconsole.conf</filename> is set up for a us 
+  keymap. You will need to edit the file to your specific needs. The
+  <filename>vconsole.conf</filename> man page has some information about
+  additional configuration options you may need or want.</para>
+
+<screen><userinput>cat &gt; /etc/vconsole.conf &lt;&lt; "EOF"
+# Begin /etc/vconsole.conf
+
+KEYMAP=us
+FONT=drdos8x16
+
+# End /etc/vconsole.conf
+EOF</userinput></screen>
 
 </sect1>
Index: BOOK/bootscripts/common/introduction.xml
===================================================================
--- BOOK/bootscripts/common/introduction.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/common/introduction.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -11,18 +11,7 @@
   <title>Introduction</title>
 
-  <para>This chapter details how to install and configure the CLFS-Bootscripts
-  package. Most of these scripts will work without modification, but a few
-  require additional configuration files because they deal with
-  hardware-dependent information.</para>
-
-  <para>System-V style init scripts are employed in this book because they
-  are widely used. For additional options, a hint detailing the BSD style
-  init setup is available at <ulink
-  url="&hints-root;BSD-Init"/>.
-  Searching the LFS mailing lists for <quote>depinit</quote> will also offer
-  additional choices.</para>
-
-  <para>If using an alternative style of init scripts, skip this chapter and
-  move on to <xref linkend="chapter-bootable"/>.</para>
+  <para>This chapter details how to finish configuring the base system.
+  Including some final configuration for systemd and as well as locales and a
+  simple bash profile that should be suitable for most users.</para>
 
 </sect1>
Index: BOOK/bootscripts/common/locale.xml
===================================================================
--- BOOK/bootscripts/common/locale.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/common/locale.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -11,10 +11,14 @@
 
   <indexterm zone="ch-scripts-locale">
-    <primary sortas="e-/etc/profile">/etc/profile</primary>
+    <primary sortas="e-/etc/locale.conf">/etc/locale.conf</primary>
   </indexterm>
 
-  <para>The base <filename>/etc/profile</filename> below sets some
-  environment variables necessary for native language support. Setting
-  them properly results in:</para>
+  <para>The file <filename>/etc/locale.conf</filename> file configures
+  system-wide locale settings. The basic file format of locale.conf is a
+  newline-separated list of variable assignments. It is possible to source this
+  configuration file from shell scripts, but it should never contain any shell
+  script features beyond variable assignments. The
+  <filename>locale.conf</filename> man page contains information about the
+  function of this file. Setting up this file properly results in:</para>
 
   <itemizedlist>
@@ -39,12 +43,8 @@
   </itemizedlist>
 
-  <para>This script also sets the <envar>INPUTRC</envar> environment variable
-  that makes Bash and Readline use the <filename>/etc/inputrc</filename> file
-  created earlier.</para>
-
   <para>Replace <replaceable>[ll]</replaceable> below with the
   two-letter code for the desired language (e.g., <quote>en</quote>) and
   <replaceable>[CC]</replaceable> with the two-letter code for the
-  appropriate country (e.g., <quote>GB</quote>).
+  appropriate country (e.g., <quote>GB</quote> or <quote>US</quote>).
   <replaceable>[charmap]</replaceable> should be replaced with the
   canonical charmap for your chosen locale.</para>
@@ -72,5 +72,5 @@
   <para>This results in a final locale setting of <quote>en_US.UTF-8</quote>.
   It is important that the locale found using the heuristic above is tested prior
-  to it being added to the Bash startup files:</para>
+  to it being added to <filename>/etc/locale.conf</filename>:</para>
 
 <screen role="nodump"><userinput>LC_ALL=[locale name] locale territory 
@@ -113,13 +113,12 @@
 
   <para>Once the proper locale settings have been determined, create the
-  <filename>/etc/profile</filename> file:</para>
+  <filename>/etc/locale.conf</filename> file:</para>
 
-<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
+<screen><userinput>cat &gt; /etc/locale.conf &lt;&lt; "EOF"
+<literal># Begin /etc/locale.conf
 
-export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
-export INPUTRC=/etc/inputrc
+LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
 
-# End /etc/profile</literal>
+# End /etc/locale.conf</literal>
 EOF</userinput></screen>
 
Index: BOOK/bootscripts/common/profile.xml
===================================================================
--- BOOK/bootscripts/common/profile.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/common/profile.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -38,7 +38,19 @@
   <para>The files <filename>/etc/profile</filename> and
   <filename>~/.bash_profile</filename> are read when the shell is
-  invoked as an interactive login shell. In the next section, a base
-  <filename>/etc/profile</filename> will be created to set up locale
-  information.</para>
+  invoked as an interactive login shell. Create a base
+  <filename>/etc/profile</filename> that will setup locale information and load
+  any bash auto completion files that may be on the system. This script also
+  sets the <envar>INPUTRC</envar> environment variable that makes Bash and
+  Readline use <filename>/etc/inputrc</filename>.</para>
+
+<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
+<literal># Begin /etc/profile
+
+source /etc/locale.conf
+for f in /etc/bash_completion.d/*.sh; do source $f; done; unset f
+export INPUTRC=/etc/inputrc
+
+# End /etc/profile</literal>
+EOF</userinput></screen>
 
 </sect1>
Index: OK/bootscripts/common/setclock.xml
===================================================================
--- BOOK/bootscripts/common/setclock.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?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-scripts-setclock">
-  <?dbhtml filename="setclock.html"?>
-
-  <title>Configuring the setclock Script</title>
-
-  <indexterm zone="ch-scripts-setclock">
-    <primary sortas="d-setclock">setclock</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para os="a">The <command>setclock</command> script reads the time from the
-  hardware clock, also known as the BIOS or the Complementary Metal Oxide
-  Semiconductor (CMOS) clock. If the hardware clock is set to UTC, this
-  script will convert the hardware clock's time to the local time using
-  the <filename>/etc/localtime</filename> file (which tells the
-  <command>hwclock</command> program which timezone the user is in). There
-  is no way to detect whether or not the hardware clock is set to UTC, so
-  this needs to be configured manually.</para>
-
-  <para os="b">If you cannot remember whether or not the hardware clock is set
-  to UTC, find out by running the <userinput>hwclock --localtime
-  --show</userinput> command. This will display what the current time is
-  according to the hardware clock. If this time matches whatever your
-  watch says, then the hardware clock is set to local time. If the output
-  from <command>hwclock</command> is not local time, chances are it is set
-  to UTC time. Verify this by adding or subtracting the proper amount of
-  hours for the timezone to the time shown by <command>hwclock</command>.
-  For example, if you are currently in the MST timezone, which is also
-  known as GMT -0700, add seven hours to the local time.</para>
-
-  <para os="c">Change the value of the <envar>UTC</envar> variable below
-  to a value of <option>0</option> (zero) if the hardware clock
-  is <emphasis>not</emphasis> set to UTC time.</para>
-
-  <para os="d">Create a new file <filename>/etc/sysconfig/clock</filename> by running
-  the following:</para>
-
-<screen><userinput>cat &gt; /etc/sysconfig/clock &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/clock
-
-UTC=1
-
-# End /etc/sysconfig/clock</literal>
-EOF</userinput></screen>
-
-  <para os="e">A good hint explaining how to deal with time on CLFS is available
-  at <ulink url="&hints-root;time.txt"/>. It explains issues such as
-  time zones, UTC, and the <envar>TZ</envar> environment variable.</para>
-
-</sect1>
Index: BOOK/bootscripts/common/usage.xml
===================================================================
--- BOOK/bootscripts/common/usage.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/common/usage.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -9,10 +9,14 @@
   <?dbhtml filename="usage.html"?>
 
-  <title>How Do These Bootscripts Work?</title>
+  <title>How does systemd work?</title>
 
   <indexterm zone="ch-scripts-usage">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
+    <primary sortas="a-systemd-usage">systemd usage</primary>
   <secondary>usage</secondary></indexterm>
 
+  <warning>
+    <para>Please disregard this page until it can be written.</para>
+  </warning>
+<!--
   <para>Linux uses a special booting facility named SysVinit that is
   based on a concept of <emphasis>run-levels</emphasis>. It can be quite
@@ -126,4 +130,5 @@
   it is your own CLFS system). The files given here are an example of how
   it can be done.</para>
+-->
 
 </sect1>
Index: BOOK/bootscripts/mips-chapter.xml
===================================================================
--- BOOK/bootscripts/mips-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/mips-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/mips64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/mips64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/mips64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/mips64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/ppc-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/ppc-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/ppc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/ppc64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -13,7 +13,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/ppc64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/ppc64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/sparc-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/sparc-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/sparc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/sparc64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/sparc64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/sparc64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/x86-chapter.xml
===================================================================
--- BOOK/bootscripts/x86-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/x86-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/x86_64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/bootscripts/x86_64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/bootscripts/x86_64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -6,14 +6,13 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
+<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
   <?dbhtml dir="bootscripts"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>Setting Up the System</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/setclock.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/console.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
Index: BOOK/chroot/common/pwdgroup.xml
===================================================================
--- BOOK/chroot/common/pwdgroup.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/chroot/common/pwdgroup.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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,7 @@
 utmp:x:&gid-utmp;:
 usb:x:&gid-usb;:
-cdrom:x:&gid-cdrom;:</literal>
+cdrom:x:&gid-cdrom;:
+messagebus:x:&gid-messagebus;:
+systemd-journal:x:&gid-systemd-journal;</literal>
 EOF</userinput></screen>
 
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/alpha-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -60,17 +63,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/aboot.xml"/>
Index: BOOK/final-system/common/acl.xml
===================================================================
--- BOOK/final-system/common/acl.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/acl.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,116 @@
+<?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-acl" role="wrap">
+  <?dbhtml filename="acl.html"?>
+
+  <title>ACL-&acl-version;</title>
+
+  <indexterm zone="ch-system-acl">
+    <primary sortas="a-ACL">ACL</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>ACL is a library for getting and setting POSIX Access Control Lists.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ACL</title>
+
+    <para os="a">Prepare ACL 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/libacl.{,l}a</userinput></screen>
+
+    <para os="j">Set the proper permissions on the library:</para>
+
+<screen os="k"><userinput>chmod 755 -v /lib/libacl.so.1.1.0</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-acl" role="content">
+    <title>Contents of ACL</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>chacl, getfacl, setfacl</seg>
+        <seg>libattr.[a,so]</seg>
+        <seg>/usr/include/acl, /usr/share/doc/acl</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="chacl">
+        <term><command>chacl</command></term>
+        <listitem>
+          <para>Changes the access control list of a file or directory</para>
+          <indexterm zone="ch-system-acl chacl">
+            <primary sortas="b-chacl">chacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getfacl">
+        <term><command>getfacl</command></term>
+        <listitem>
+          <para>Get file access control lists</para>
+          <indexterm zone="ch-system-acl getfacl">
+            <primary sortas="b-getfacl">getfacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfacl">
+        <term><command>setfacl</command></term>
+        <listitem>
+          <para>Set file access control lists</para>
+          <indexterm zone="ch-system-acl setfacl">
+            <primary sortas="b-setfacl">setfacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libacl">
+        <term><filename class="libraryfile">libacl</filename></term>
+        <listitem>
+          <para>Library to manage access control lists</para>
+          <indexterm zone="ch-system-acl libacl">
+            <primary sortas="c-libacl">libacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/attr.xml
===================================================================
--- BOOK/final-system/common/attr.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/attr.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/common/coreutils.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -38,5 +38,5 @@
   ./configure --prefix=/usr \
     --enable-no-install-program=kill,uptime \
-    --enable-install-program=hostname</userinput></screen>
+    --enable-install-program=hostname --libexecdir=/usr/lib</userinput></screen>
     
     <variablelist os="d1">
@@ -96,13 +96,4 @@
 mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
 mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
-
-    <para os="t">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="u"><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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/dbus.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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 D-Bus for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
+    --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: OK/final-system/common/eudev.xml
===================================================================
--- BOOK/final-system/common/eudev.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,280 +1,0 @@
-<?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-eudev" role="wrap">
-  <?dbhtml filename="eudev.html"?>
-
-  <title>Eudev-&eudev-version;</title>
-
-  <indexterm zone="ch-system-eudev">
-    <primary sortas="a-Eudev">Eudev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Eudev package contains programs for dynamic creation of device
-    nodes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <para os="a">Prepare Eudev for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-    --with-rootprefix="" --libexecdir=/lib --enable-split-usr \
-    --libdir=/usr/lib --with-rootlibdir=/lib --sbindir=/sbin --bindir=/sbin \
-    --enable-rule_generator --disable-introspection --disable-keymap \
-    --disable-gudev --disable-gtk-doc-html --with-firmware-path=/lib/firmware \
-    --enable-libkmod</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Create a directory for storing firmware that can be
-    loaded by <command>udev</command>:</para>
-
-<screen os="j"><userinput>install -dv /lib/firmware</userinput></screen>
-
-    <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para>
-
-<screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \
-> /etc/udev/rules.d/80-net-name-slot.rules</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-eudev" role="content">
-    <title>Contents of Eudev</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
-        firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, usb_id,
-        v4l_id, write_cd_rules, write_net_rules</seg>
-        <seg>libudev</seg>
-        <seg>/etc/udev, /lib/firmware, /lib/udev, /usr/share/doc/udev</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udevadm">
-        <term><command>udevadm</command></term>
-        <listitem>
-        <para>Controls the runtime behavior of Eudev, requests kernel
-        events, manages the event queue, and provides simple debugging.</para>
-          <indexterm zone="ch-system-eudev udevadm">
-            <primary sortas="b-udevadm">udevadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevd">
-        <term><command>udevd</command></term>
-        <listitem>
-          <para>A daemon that reorders hotplug events before submitting them to
-          <command>udev</command>,
-          thus avoiding various race conditions</para>
-          <indexterm zone="ch-system-eudev udevd">
-            <primary sortas="b-udevd">udevd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
- <!-- Start of Helpers -->
-      <varlistentry id="ata_id">
-        <term><command>ata_id</command></term>
-        <listitem>
-          <para>Provides Eudev with a unique string and additional
-          information (uuid, label) for an ATA drive</para>
-          <indexterm zone="ch-system-eudev ata_id">
-            <primary sortas="b-ata_id">ata_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cdrom_id">
-        <term><command>cdrom_id</command></term>
-        <listitem>
-          <para>Prints the capabilities of a CDROM or DVDROM drive.</para>
-          <indexterm zone="ch-system-eudev cdrom_id">
-            <primary sortas="b-cdrom_id">cdrom_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="collect">
-        <term><command>collect</command></term>
-        <listitem>
-          <para>Given an ID for the current uevent and a list of IDs
-(for all target uevents), registers the current ID and indicates whether
-all target IDs have been registered.</para>
-          <indexterm zone="ch-system-eudev collect">
-            <primary sortas="b-collect">collect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="create_floppy_devices">
-        <term><command>create_floppy_devices</command></term>
-        <listitem>
-          <para>Creates all possible floppy devices based on the CMOS type</para>
-          <indexterm zone="ch-system-eudev create_floppy_devices">
-            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="edd_id">
-        <term><command>edd_id</command></term>
-        <listitem>
-          <para>Identifies x86 disk drives from Enhanced Disk Drive calls</para>
-          <indexterm zone="ch-system-eudev edd_id">
-            <primary sortas="b-edd_id">edd_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="firmware.sh">
-        <term><command>firmware.sh</command></term>
-        <listitem>
-          <para>Script to load firmware for a device</para>
-          <indexterm zone="ch-system-eudev firmware.sh">
-            <primary sortas="b-firmware.sh">firmware.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fstab_import">
-        <term><command>fstab_import</command></term>
-        <listitem>
-          <para>Finds an entry in <filename>/etc/fstab</filename> that matches
-the current device, and provides its information to Udev.</para>
-          <indexterm zone="ch-system-eudev fstab_import">
-            <primary sortas="b-fstab_import">fstab_import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="path_id">
-        <term><command>path_id</command></term>
-        <listitem>
-          <para>Provides the shortest possible unique hardware path to a
-          device</para>
-          <indexterm zone="ch-system-eudev path_id">
-            <primary sortas="b-path_id">path_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_id">
-        <term><command>scsi_id</command></term>
-        <listitem>
-          <para>Retrieves or generates a unique SCSI identifier.</para>
-          <indexterm zone="ch-system-eudev scsi_id">
-            <primary sortas="b-scsi_id">scsi_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usb_id">
-        <term><command>usb_id</command></term>
-        <listitem>
-          <para>Identifies a USB block device.</para>
-          <indexterm zone="ch-system-eudev usb_id">
-            <primary sortas="b-usb_id">usb_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="v4l_id">
-        <term><command>v4l_id</command></term>
-        <listitem>
-          <para>Determines V4L capabilities for a given device.</para>
-          <indexterm zone="ch-system-eudev v4l_id">
-            <primary sortas="b-v4l_id">v4l_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write_cd_rules">
-        <term><command>write_cd_rules</command></term>
-        <listitem>
-          <para>A script which generates Eudev rules to provide stable names
-for network interfaces.</para>
-          <indexterm zone="ch-system-eudev write_cd_rules">
-            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write_net_rules">
-        <term><command>write_net_rules</command></term>
-        <listitem>
-          <para>A script which generates Eudev rules to provide stable names
-for network interfaces.</para>
-          <indexterm zone="ch-system-eudev write_net_rules">
-            <primary sortas="b-write_net_rules">write_net_rules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!-- End of Helpers -->
-
-      <varlistentry id="libudev">
-        <term><filename class="libraryfile">libudev</filename></term>
-        <listitem>
-          <para>A library interface to eudev device information.</para>
-          <indexterm zone="ch-system-eudev libudev">
-            <primary sortas="c-libudev">libudev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="etc-eudev">
-        <term><filename class="directory">/etc/udev</filename></term>
-        <listitem>
-          <para>Contains <command>udev</command> configuration files,
-          device permissions, and rules for device naming</para>
-          <indexterm zone="ch-system-eudev etc-eudev">
-            <primary sortas="e-/etc/udev">/etc/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lib-eudev">
-        <term><filename class="directory">/lib/udev</filename></term>
-        <listitem>
-          <para>Contains <command>udev</command> helper programs
-          and static devices which get copied to /dev when booted.</para>
-          <indexterm zone="ch-system-eudev lib-eudev">
-            <primary sortas="e-/lib/udev">/lib/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/expat.xml
===================================================================
--- BOOK/final-system/common/expat.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/expat.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/gperf.xml
===================================================================
--- BOOK/final-system/common/gperf.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/gperf.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,77 @@
+<?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-gperf" role="wrap">
+  <?dbhtml filename="gperf.html"?>
+
+  <title>Gperf-&gperf-version;</title>
+
+  <indexterm zone="ch-system-gperf">
+    <primary sortas="a-Gperf">Gperf</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Gperf generates a perfect hash function from a key set.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gperf</title>
+
+    <para os="a">Prepare Gperf for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gperf-&gperf-version;</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-gperf" role="content">
+    <title>Contents of Gperf</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>gperf</seg>
+        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gperf">
+        <term><command>gperf</command></term>
+        <listitem>
+          <para>Generates a perfect hash function from a key set</para>
+          <indexterm zone="ch-system-gperf gperf">
+            <primary sortas="b-gperf">gperf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/intltool.xml
===================================================================
--- BOOK/final-system/common/intltool.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/intltool.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,77 @@
+<?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-intltool" role="wrap">
+  <?dbhtml filename="intltool.html"?>
+
+  <title>Intltool-&intltool-version;</title>
+
+  <indexterm zone="ch-system-intltool">
+    <primary sortas="a-Intltool">Intltool</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Intltool package contains internationalization tools.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Intltool</title>
+
+    <para os="a">Prepare Intltool 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:</para>
+
+<screen os="e2"><userinput remap="test">make check</userinput></screen>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-intltool" role="content">
+    <title>Contents of Intltool</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>intltool-extract</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="intltool-extract">
+        <term><command>intltool-extract</command></term>
+        <listitem>
+          <para>Tries to classify each given file; it does this by performing
+          several tests&mdash;file system tests, magic number tests, and
+          language tests</para>
+          <indexterm zone="ch-system-file intltool-extract">
+            <primary sortas="b-intltool-extract">intltool-extract</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/common/kbd.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -41,10 +41,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,setvtrgb} /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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/libcap.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,122 @@
+<?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="p1">Apply the following patch to fix a problem with Libcap's
+    installed header files:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../libcap-&libcap-version;-uapi-1.patch</userinput></screen>
+
+    <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 RAISE_SETFCAP=no install
+chmod -v 755 /lib/libcap.so.&libcap-version;
+rm -v /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: OK/final-system/common/libee.xml
===================================================================
--- BOOK/final-system/common/libee.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?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-libee" role="wrap">
-  <?dbhtml filename="libee.html"?>
-
-  <title>Libee-&libee-version;</title>
-
-  <indexterm zone="ch-system-libee">
-    <primary sortas="a-Libee">Libee</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Libee is an event expression library.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libee</title>
-
-    <para os="a">Prepare Libee for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<note os="n1">
-    <para>Libee will fail to compile if using multiple jobs with make. Append "<command>-j 1</command>" to the following make command:</para>
-</note>
-
-<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-libee" role="content">
-    <title>Contents of Libee</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>libee-convert</seg>
-        <seg>libee.[a,so]</seg>
-        <seg>/usr/include/libee</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libee-convert">
-        <term><command>libee-convert</command></term>
-        <listitem>
-          <para>todo</para>
-          <indexterm zone="ch-system-libee libee-convert">
-            <primary sortas="b-libee-convert">libee-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libee">
-        <term><filename class="libraryfile">libee</filename></term>
-        <listitem>
-          <para>is the event expression library</para>
-          <indexterm zone="ch-system-libee libee">
-            <primary sortas="c-libee">libee</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/libestr.xml
===================================================================
--- BOOK/final-system/common/libestr.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?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-libestr" role="wrap">
-  <?dbhtml filename="libestr.html"?>
-
-  <title>Libestr-&libestr-version;</title>
-
-  <indexterm zone="ch-system-libestr">
-    <primary sortas="a-Libestr">Libestr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Libestr package is a library for some string essentials.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libestr</title>
-
-    <para os="a">Prepare Libestr 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">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-libestr" role="content">
-    <title>Contents of Libestr</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>libestr.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libestr">
-        <term><filename class="libraryfile">libestr</filename></term>
-        <listitem>
-          <para>contains functions for aiding in string functions</para>
-          <indexterm zone="ch-system-libestr libestr">
-            <primary sortas="c-libestr">libestr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/rsyslog.xml
===================================================================
--- BOOK/final-system/common/rsyslog.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?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-rsyslog" xreflabel="rsyslog" role="wrap">
-  <?dbhtml filename="rsyslog.html"?>
-
-  <title>Rsyslog-&rsyslog-version;</title>
-
-  <indexterm zone="ch-system-rsyslog">
-    <primary sortas="a-rsyslog">rsyslog</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The rsyslog package contains programs for logging system messages,
-    such as those given by the kernel when unusual things happen.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rsyslog</title>
-
-    <para os="a">Prepare Rsyslog 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:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Create a directory for expansion snippets:</para>
-
-<screen os="i"><userinput>install -dv /etc/rsyslog.d</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-rsyslog" role="configuration">
-    <title>Configuring rsyslog</title>
-
-    <indexterm zone="conf-rsyslog">
-      <primary sortas="a-rsyslog">rsyslog</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-rsyslog">
-      <primary sortas="e-/etc/rsyslog.conf">/etc/rsyslog.conf</primary>
-    </indexterm>
-
-    <para>Create a new <filename>/etc/rsyslog.conf</filename> file by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/rsyslog.conf &lt;&lt; "EOF"
-<literal># Begin /etc/rsyslog.conf
-
-# CLFS configuration of rsyslog. For more info use man rsyslog.conf
-
-#######################################################################
-# Rsyslog Modules
-
-# Support for Local System Logging
-$ModLoad imuxsock.so
-
-# Support for Kernel Logging
-$ModLoad imklog.so
-
-#######################################################################
-# Global Options
-
-# Use traditional timestamp format.
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-# Set the default permissions for all log files.
-$FileOwner root
-$FileGroup root
-$FileCreateMode 0640
-$DirCreateMode 0755
-
-# Provides UDP reception
-$ModLoad imudp
-$UDPServerRun 514
-
-# Disable Repeating of Entries
-$RepeatedMsgReduction on
-
-#######################################################################
-# Include Rsyslog Config Snippets
-
-$IncludeConfig /etc/rsyslog.d/*.conf
-
-#######################################################################
-# Standard Log Files
-
-auth,authpriv.*			/var/log/auth.log
-*.*;auth,authpriv.none		-/var/log/syslog
-daemon.*			-/var/log/daemon.log
-kern.*				-/var/log/kern.log
-lpr.*				-/var/log/lpr.log
-mail.*				-/var/log/mail.log
-user.*				-/var/log/user.log
-
-# Catch All Logs
-*.=debug;\
-	auth,authpriv.none;\
-	news.none;mail.none	-/var/log/debug
-*.=info;*.=notice;*.=warn;\
-	auth,authpriv.none;\
-	cron,daemon.none;\
-	mail,news.none		-/var/log/messages
-
-# Emergencies are shown to everyone
-*.emerg				*
-
-# End /etc/rsyslog.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-rsyslog" role="content">
-    <title>Contents of rsyslog</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>rsyslogd</seg>
-        <seg>/usr/lib/rsyslog</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rsyslogd">
-        <term><command>rsyslogd</command></term>
-        <listitem>
-          <para>Logs the messages that system programs offer for logging.
-          Every logged message contains at least a date stamp and a hostname,
-          and normally the program's name too, but that depends on how
-          trusting the logging daemon is told to be.</para>
-          <indexterm zone="ch-system-rsyslog rsyslogd">
-            <primary sortas="b-rsyslogd">rsyslogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/systemd.xml
===================================================================
--- BOOK/final-system/common/systemd.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/systemd.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,243 @@
+<?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-systemd" role="wrap">
+  <?dbhtml filename="systemd.html"?>
+
+  <title>systemd-&systemd-version;</title>
+
+  <indexterm zone="ch-system-systemd">
+    <primary sortas="a-systemd">systemd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para><command>systemd</command> is a system and service manager for Linux
+    operating systems.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of systemd</title>
+
+    <para os="a">Prepare systemd for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
+    --with-rootprefix="" --with-rootlibdir=/lib \
+    --enable-split-usr --disable-gudev</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">Install the package:</para>
+
+<screen os="f"><userinput>make install</userinput></screen>
+
+    <para os="g">Install man pages and documentation files that are not
+    installed by default:</para>
+
+<screen os="h"><userinput>for section in 1 3 5 7 8
+do
+  install -v -m644 man/*.${section} /usr/share/man/man${section}
+done
+install -v -m644 man/*.html /usr/share/doc/systemd-&systemd-version;</userinput></screen>
+
+    <para os="i">Create symlinks for backwards-compatibility with Sysvinit:</para>
+
+<screen os="j"><userinput>for tool in runlevel reboot shutdown poweroff halt telinit; do
+  ln -sfv ../bin/systemctl /sbin/$tool
+done
+ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
+
+    <para os="k">Modify a configuration file which references a group that
+    doesn't exist:</para>
+
+<screen os="l"><userinput>sed -i "s@root lock@0root root@g" /usr/lib/tmpfiles.d/legacy.conf</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="conf-systemd" role="configuration">
+    <title>Configuring systemd</title>
+
+    <indexterm zone="conf-systemd">
+      <primary sortas="a-systemd">systemd</primary>
+    <secondary>configuring</secondary></indexterm>
+
+    <indexterm zone="conf-systemd">
+      <primary sortas="e-/etc/os-release">/etc/os-release</primary>
+    </indexterm>
+
+    <para>Create <filename>/etc/machine-id</filename> which is needed
+    by Journald:</para>
+
+<screen><userinput>systemd-machine-id-setup</userinput></screen>
+
+    <para>Create a file to identify the operating system.
+    <command>systemd</command> will use this file on boot to put information
+    on the screen.</para>
+
+<screen><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
+# Begin /etc/os-release
+
+NAME=Cross-LFS
+ID=clfs
+
+PRETTY_NAME=Cross Linux From Scratch
+ANSI_COLOR=0;33
+
+VERSION=&version;
+VERSION_ID=&versionid;
+
+# End /etc/os-release
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-systemd" role="content">
+    <title>Contents of systemd</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>systemctl, systemd, systemd-ask-password, systemd-cgls,
+        systemd-notify, systemd-tty-ask-password-agent</seg>
+        <seg>pam_systemd</seg>
+        <seg>/lib/systemd, /etc/systemd, /etc/tmpfiles.d,
+        /usr/share/systemd</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="systemctl">
+        <term><command>systemctl</command></term>
+        <listitem>
+          <para>Control the systemd system and service manager</para>
+          <indexterm zone="ch-system-systemd systemctl">
+            <primary sortas="b-systemctl">systemctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd">
+        <term><command>systemd</command></term>
+        <listitem>
+          <para>System and service manager for Linux</para>
+          <indexterm zone="ch-system-systemd systemd">
+            <primary sortas="b-systemd">systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-ask-password">
+        <term><command>systemd-ask-password</command></term>
+        <listitem>
+          <para>Queries the user for a system passphrase, via the
+          TTY or an UI agent.</para>
+          <indexterm zone="ch-system-systemd systemd-ask-password">
+            <primary sortas="b-systemd-ask-password">systemd-ask-password</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-cgls">
+        <term><command>systemd-cgls</command></term>
+        <listitem>
+          <para>Recursively shows control group contents</para>
+          <indexterm zone="ch-system-systemd systemd-cgls">
+            <primary sortas="b-systemd-cgls">systemd-cgls</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-notify">
+        <term><command>systemd-notify</command></term>
+        <listitem>
+          <para>Notify init system about start-up completion and other daemon
+          status changes</para>
+          <indexterm zone="ch-system-systemd systemd-notify">
+            <primary sortas="b-systemd-notify">systemd-notify</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="systemd-tty-ask-password-agent">
+        <term><command>systemd-tty-ask-password-agent</command></term>
+        <listitem>
+          <para>Process system password requests</para>
+          <indexterm zone="ch-system-systemd systemd-tty-ask-password-agent">
+            <primary sortas="b-systemd-tty-ask-password-agent">systemd-tty-ask-password-agent</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pam_systemd">
+        <term><filename class="libraryfile">pam_systemd</filename></term>
+        <listitem>
+          <para>Register user sessions in the systemd control group
+          hierarchy</para>
+          <indexterm zone="ch-system-systemd pam_systemd">
+            <primary sortas="c-pam_systemd">pam_systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lib-systemd">
+        <term><filename class="directory">/lib/systemd</filename></term>
+        <listitem>
+          <para>Location of system units and configurations</para>
+          <indexterm zone="ch-system-systemd lib-systemd">
+            <primary sortas="e-/lib/systemd">/lib/systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="etc-systemd">
+        <term><filename class="directory">/etc/systemd</filename></term>
+        <listitem>
+          <para>Location of user units and configurations</para>
+          <indexterm zone="ch-system-systemd etc-systemd">
+            <primary sortas="e-/etc/systemd">/etc/systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="etc-tmpfilesd">
+        <term><filename class="directory">/etc/tmpfiles.d</filename></term>
+        <listitem>
+          <para>Configuration for creation, deletion and cleaning of temporary
+          and volatile files</para>
+          <indexterm zone="ch-system-systemd etc-tmpfilesd">
+            <primary sortas="e-/etc/tmpfiles.d">/etc/tmpfiles.d</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="usr-share-systemd">
+        <term><filename class="directory">/usr/share/systemd</filename></term>
+        <listitem>
+          <para>Location of session unit files</para>
+          <indexterm zone="ch-system-systemd usr-share-systemd">
+            <primary sortas="e-/usr/share/systemd">/usr/share/systemd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: OK/final-system/common/sysvinit.xml
===================================================================
--- BOOK/final-system/common/sysvinit.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,264 +1,0 @@
-<?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-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Sysvinit package contains programs for controlling the startup,
-    running, and shutdown of the system.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-<para os ="a">Apply a sed which disables last, mesg, mountpoint, sulogin,
-utmpdump, and wall from being built and installed as they are provided by
-Util-linux:</para>
-
-<screen os="b"><userinput>sed -i -e 's/\ sulogin[^ ]*//' \
-    -e '/utmpdump/d' -e '/mountpoint/d' -e '/mesg/d' src/Makefile</userinput></screen>
-
-<para os ="c">Compile the package:</para>
-
-<screen os="d"><userinput>make -C src clobber
-make -C src</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make -C src install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>/etc/inittab</filename> by running the
-    following:</para>
-
-<screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"
-<literal># Begin /etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/sbin/sulogin
-</literal>
-EOF</userinput></screen>
-
-    <para>The following command adds the standard virtual terminals to
-    <filename>/etc/inittab</filename>. If your system only has a serial
-    console skip the following command:</para>
-
-<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
-<literal>1:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty --noclear -I '\033(K' tty6 9600
-</literal>
-EOF</userinput></screen>
-
-    <para>If your system has a serial console run the following command to add
-    the entry to <filename>/etc/inittab</filename>:</para>
-
-<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
-<literal>c0:12345:respawn:/sbin/agetty --noclear 115200 ttyS0 vt100
-</literal>
-EOF</userinput></screen>
-
-   <para>Finally, add the end line to <filename>/etc/inittab</filename>:</para>
-
-<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
-<literal># End /etc/inittab</literal>
-EOF</userinput></screen>
-
-    <para>The <parameter>-I '\033(K'</parameter> option tells
-    <command>agetty</command> to send this escape sequence to the terminal
-    before doing anything else. This escape sequence switches the console
-    character set to a user-defined one, which can be modified by running
-    the <command>setfont</command> program. The <command>console</command>
-    initscript from the CLFS-Bootscripts package calls the
-    <command>setfont</command> program during system startup. Sending this
-    escape sequence is necessary for people who use non-ISO 8859-1 screen
-    fonts, but it does not affect native English speakers.</para>
-
-  </sect2>
-
-  <sect2 id="contents-sysvinit" role="content">
-    <title>Contents of Sysvinit</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bootlogd, fstab-decode, halt, init, killall5, pidof (link to
-        killall5), poweroff (link to halt), reboot (link to halt), runlevel,
-        shutdown, and telinit (link to init)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bootlogd">
-        <term><command>bootlogd</command></term>
-        <listitem>
-          <para>Logs boot messages to a log file</para>
-          <indexterm zone="ch-system-sysvinit bootlogd">
-            <primary sortas="b-bootlogd">bootlogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fstab-decode">
-        <term><command>fstab-decode</command></term>
-        <listitem>
-          <para>Runs a command with fstab-encoded arguments</para>
-          <indexterm zone="ch-system-sysvinit fstab-decode">
-            <primary sortas="b-fstab-decode">fstab-decode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Normally invokes <command>shutdown</command> with the
-          <parameter>-h</parameter> option, except when already in run-level 0,
-          then it tells the kernel to halt the system; it notes in the
-          file <filename>/var/log/wtmp</filename> that the system is being
-          brought down</para>
-          <indexterm zone="ch-system-sysvinit halt">
-            <primary sortas="b-halt">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="init">
-        <term><command>init</command></term>
-        <listitem>
-          <para>The first process to be started when the kernel has initialized
-          the hardware which takes over the boot process and starts all the
-          proceses it is instructed to</para>
-          <indexterm zone="ch-system-sysvinit init">
-            <primary sortas="b-init">init</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="killall5">
-        <term><command>killall5</command></term>
-        <listitem>
-          <para>Sends a signal to all processes, except the processes in its own
-          session so it will not kill the shell running the script that called
-          it</para>
-          <indexterm zone="ch-system-sysvinit killall5">
-            <primary sortas="b-killall5">killall5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pidof">
-        <term><command>pidof</command></term>
-        <listitem>
-          <para>Reports the PIDs of the given programs</para>
-          <indexterm zone="ch-system-sysvinit pidof">
-            <primary sortas="b-pidof">pidof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="poweroff">
-        <term><command>poweroff</command></term>
-        <listitem>
-          <para>Tells the kernel to halt the system and switch off the computer
-          (see <command>halt</command>)</para>
-          <indexterm zone="ch-system-sysvinit poweroff">
-            <primary sortas="b-poweroff">poweroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Tells the kernel to reboot the system (see
-          <command>halt</command>)</para>
-          <indexterm zone="ch-system-sysvinit reboot">
-            <primary sortas="b-reboot">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runlevel">
-        <term><command>runlevel</command></term>
-        <listitem>
-          <para>Reports the previous and the current run-level, as noted in
-          the last run-level record in <filename>/var/run/utmp</filename></para>
-          <indexterm zone="ch-system-sysvinit runlevel">
-            <primary sortas="b-runlevel">runlevel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shutdown">
-        <term><command>shutdown</command></term>
-        <listitem>
-          <para>Brings the system down in a secure way, signaling all processes
-          and notifying all logged-in users</para>
-          <indexterm zone="ch-system-sysvinit shutdown">
-            <primary sortas="b-shutdown">shutdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telinit">
-        <term><command>telinit</command></term>
-        <listitem>
-          <para>Tells <command>init</command> which run-level to change to</para>
-          <indexterm zone="ch-system-sysvinit telinit">
-            <primary sortas="b-telinit">telinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/common/util-linux.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -77,10 +77,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/common/xml-parser.xml
===================================================================
--- BOOK/final-system/common/xml-parser.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/common/xml-parser.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,60 @@
+<?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-xml-parser" role="wrap">
+  <?dbhtml filename="xml-parser.html"?>
+
+  <title>XML::Parser-&xml-parser-version;</title>
+
+  <indexterm zone="ch-system-xml-parser">
+    <primary sortas="a-XML-Parser">XML::Parser</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>XML::Parser is a perl module for parsing XML documents.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of XML::Parser</title>
+
+    <para os="a">Prepare XML::Parser for compilation:</para>
+
+<screen os="b"><userinput>perl Makefile.PL</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">To test the results, issue:</para>
+
+<screen os="e2"><userinput remap="test">make test</userinput></screen>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-xml-parser" role="content">
+    <title>Contents of XML::Parser</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <segtitle>Installed libraries</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/mips-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -60,17 +63,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -60,17 +63,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/mips64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -39,4 +39,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
@@ -76,5 +77,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/zlib-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
@@ -93,4 +97,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
@@ -99,4 +104,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
@@ -104,4 +112,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-n32.xml"/>
@@ -109,17 +125,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/colo.xml"/>
Index: BOOK/final-system/multilib/attr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/attr-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/attr-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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/2001/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/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/attr-n32.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/attr.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/attr.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/multilib/coreutils.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -103,12 +103,4 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
   </sect2>
 
Index: BOOK/final-system/multilib/dbus-64bit.xml
===================================================================
--- BOOK/final-system/multilib/dbus-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/dbus-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/dbus-n32.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/dbus.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/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: OK/final-system/multilib/eudev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eudev-64bit.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?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-eudev" role="wrap">
-  <?dbhtml filename="eudev-64bit.html"?>
-
-  <title>Eudev-&eudev-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-eudev">
-    <primary sortas="a-Eudev">Eudev</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} \
-CC="gcc ${BUILD64}" ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-rootprefix="" --libexecdir=/lib64 --libdir=/usr/lib64 \
-    --with-rootlibdir=/lib64 --sbindir=/sbin --bindir=/sbin \
-    --enable-split-usr --enable-rule_generator --disable-introspection \
-    --disable-keymap --disable-gudev --disable-gtk-doc-html \
-    --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='r2'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
-  xpointer="xpointer(id('contents-eudev'))"/>
-
-</sect1>
Index: OK/final-system/multilib/eudev-n32.xml
===================================================================
--- BOOK/final-system/multilib/eudev-n32.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?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-eudev-n32" role="wrap">
-  <?dbhtml filename="udev-n32.html"?>
-
-  <title>Eudev-&eudev-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-eudev-n32">
-    <primary sortas="a-Eudev">Eudev</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>
-PKG_CONFIG_PATH=${PKG_CONFIG_PATHN32} \
-CC="gcc ${BUILDN32}" ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-rootprefix="" --libexecdir=/lib32 --enable-split-usr \
-    --libdir=/usr/lib32 --with-rootlibdir=/lib32 --sbindir=/sbin \
-    --bindir=/sbin --enable-rule_generator --disable-introspection \
-    --disable-keymap --disable-gudev --disable-gtk-doc-html --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-eudev" role="."/></para>
-
-  </sect2>
-</sect1>
-
-
-
Index: OK/final-system/multilib/eudev.xml
===================================================================
--- BOOK/final-system/multilib/eudev.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?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-eudev-32" role="wrap">
-  <?dbhtml filename="eudev.html"?>
-
-  <title>Eudev-&eudev-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-eudev-32">
-    <primary sortas="a-Eudev">Eudev 32 Bit Libraries</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
-CC="gcc ${BUILD32}" ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-rootprefix="" --libexecdir=/lib --enable-split-usr \
-    --libdir=/usr/lib --with-rootlibdir=/lib --sbindir=/sbin --bindir=/sbin \
-    --enable-rule_generator --disable-introspection --disable-keymap \
-    --disable-gudev --disable-gtk-doc-html --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-eudev" role="."/></para>
-
-  </sect2>
-</sect1>
-
Index: BOOK/final-system/multilib/expat-64bit.xml
===================================================================
--- BOOK/final-system/multilib/expat-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/expat-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/expat-n32.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/expat.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/libcap-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/libcap-n32.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/libcap.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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/2001/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/2001/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/2001/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/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: OK/final-system/multilib/libee-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libee-64bit.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?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-libee" role="wrap">
-  <?dbhtml filename="libee-64bit.html"?>
-
-  <title>Libee-&libee-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-libee">
-    <primary sortas="a-Libee">Libee</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libee</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
-  xpointer="xpointer(id('contents-libee'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libee-n32.xml
===================================================================
--- BOOK/final-system/multilib/libee-n32.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?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-libee-n32" role="wrap">
-  <?dbhtml filename="libee-n32.html"?>
-
-  <title>Libee-&libee-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libee-n32">
-    <primary sortas="a-Libee">Libee</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libee</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libee" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libee.xml
===================================================================
--- BOOK/final-system/multilib/libee.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?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-libee-32" role="wrap">
-  <?dbhtml filename="libee.html"?>
-
-  <title>Libee-&libee-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libee-32">
-    <primary sortas="a-Libee">Libee</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libee</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
-  ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libee" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libestr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libestr-64bit.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?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-libestr" role="wrap">
-  <?dbhtml filename="libestr-64bit.html"?>
-
-  <title>Libestr-&libestr-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-libestr">
-    <primary sortas="a-Libestr">Libestr</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libestr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libestr</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.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/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libestr.xml"
-  xpointer="xpointer(id('contents-libestr'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libestr-n32.xml
===================================================================
--- BOOK/final-system/multilib/libestr-n32.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?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-libestr-n32" role="wrap">
-  <?dbhtml filename="libestr-n32.html"?>
-
-  <title>Libestr-&libestr-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libestr-n32">
-    <primary sortas="a-Libestr">Libestr</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libestr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libestr</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.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/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libestr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libestr.xml
===================================================================
--- BOOK/final-system/multilib/libestr.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?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-libestr-32" role="wrap">
-  <?dbhtml filename="libestr.html"?>
-
-  <title>Libestr-&libestr-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libestr-32">
-    <primary sortas="a-Libestr">Libestr</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libestr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libestr</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libestr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/rsyslog.xml
===================================================================
--- BOOK/final-system/multilib/rsyslog.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?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-rsyslog" xreflabel="rsyslog" role="wrap">
-  <?dbhtml filename="rsyslog.html"?>
-
-  <title>Rsyslog-&rsyslog-version;</title>
-
-  <indexterm zone="ch-system-rsyslog">
-    <primary sortas="a-rsyslog">rsyslog</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Rsyslog</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
-  xpointer="xpointer(id('conf-rsyslog'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
-  xpointer="xpointer(id('contents-rsyslog'))"/>
-
-</sect1>
Index: BOOK/final-system/multilib/systemd-64bit.xml
===================================================================
--- BOOK/final-system/multilib/systemd-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/systemd-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,84 @@
+<?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-systemd" role="wrap">
+  <?dbhtml filename="systemd-64bit.html"?>
+
+  <title>systemd-&systemd-version;</title>
+
+  <indexterm zone="ch-system-systemd">
+    <primary sortas="a-systemd">systemd</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of systemd</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
+    --with-rootprefix="" -with-rootlibdir=/lib \
+    --enable-split-usr --disable-gudev</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(id('conf-systemd'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(id('contents-systemd'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/systemd-n32.xml
===================================================================
--- BOOK/final-system/multilib/systemd-n32.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/systemd-n32.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,89 @@
+<?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-systemd-n32" role="wrap">
+  <?dbhtml filename="systemd-n32.html"?>
+
+  <title>systemd-&systemd-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-systemd-n32">
+    <primary sortas="a-systemd">systemd</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of systemd</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='mlw1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib32 --docdir=/usr/share/doc/systemd-&systemd-version; \
+    --with-rootprefix="" -with-rootlibdir=/lib32 \
+    --enable-split-usr --disable-gudev</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="systemd.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-systemd" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/systemd.xml
===================================================================
--- BOOK/final-system/multilib/systemd.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ BOOK/final-system/multilib/systemd.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,90 @@
+<?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-systemd-32" role="wrap">
+  <?dbhtml filename="systemd.html"?>
+
+  <title>systemd-&systemd-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-systemd-32">
+    <primary sortas="a-systemd">systemd</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/systemd.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of systemd</title>
+
+    <note os="mlw1">
+      <para>If you do not have Linux-PAM installed in your system you can safely
+      skip this page. If you do have Linux-PAM installed and you wish to use
+      <filename class="libraryfile">pam_systemd.so</filename>
+      to register and control user sessions within the systemd control group
+      hierarchy, follow the instructions to install the module.</para>
+    </note>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
+    --with-rootprefix="" --with-rootlibdir=/lib \
+    --enable-split-usr --disable-gudev</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>make pam_systemd.la</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>make install-pamlibLTLIBRARIES</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/systemd.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-systemd" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: OK/final-system/multilib/sysvinit.xml
===================================================================
--- BOOK/final-system/multilib/sysvinit.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?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-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-  
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>make -C src clobber
-make -C src CC="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('conf-sysvinit'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: BOOK/final-system/multilib/util-linux-64bit.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-64bit.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/multilib/util-linux-64bit.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -61,12 +61,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/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 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/multilib/util-linux-n32.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -58,12 +58,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/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 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/ppc-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -60,17 +63,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
Index: BOOK/final-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/ppc64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +55,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -63,14 +65,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/ppc64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -61,4 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
@@ -74,4 +77,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
@@ -80,22 +84,24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/sparc-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -60,17 +63,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -60,17 +63,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -61,4 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
@@ -74,4 +77,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
@@ -80,22 +84,24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/elftoaout.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/x86-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -60,17 +63,19 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
+<!--   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
@@ -54,4 +56,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
@@ -60,17 +63,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/final-system/x86_64-chapter.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -61,4 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/readline-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/attr-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
@@ -74,4 +77,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/groff.xml"/>
@@ -80,22 +84,24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libcap-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/man.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/expat-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/dbus-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub.xml"/>
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/general.ent	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -13,4 +13,5 @@
 <!ENTITY generic-version "git"> <!-- Use "git", "testing", or "x.y.z[-pre{x}]" -->
 
+<!ENTITY versionid "&year;&month;&day;"> <!-- /etc/os-release from systemd -->
 <!ENTITY version "GIT-&year;&month;&day;">
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/introduction/common/changelog.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -31,18 +31,56 @@
         </listitem>
         <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
+          <para>[name] - Previous changelog entry.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 -->
+
     <listitem>
       <para>06 January 2014</para>
       <itemizedlist>
         <listitem>
+          <para>[Chris] - Added msgmerge and xgettext to /tools Gettext
+          installation - needed for attr.</para>
+        </listitem>
+        <listitem>
           <para>[William Harrington] - Update DHCPCD to 6.2.0.</para>
         </listitem>
         <listitem>
           <para>[William Harrington] - Update Grep to 2.16.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>05 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed rsyslog and its depedencies, libee and libestr.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Expat to 2.1.0.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Attr to 2.4.47.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated D-Bus to 1.6.18.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Updated Libcap to 2.23.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>04 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Updated Systemd to 208.</para>
+        </listitem>
+        <listitem>
+          <para>[Chris] - Added Gperf, XML::Parser, Intltool, and ACL - needed
+          by systemd.</para>
         </listitem>
       </itemizedlist>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/materials/common/packages.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -16,4 +16,22 @@
 
     <varlistentry>
+      <term>ACL (&acl-version;) - <token>&acl-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&acl-home;"/></para>
+        <para>Download: <ulink url="&acl-url;"/></para>
+        <para>MD5 sum: <literal>&acl-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <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>
@@ -115,4 +133,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>
@@ -160,9 +187,9 @@
 
     <varlistentry>
-      <term>Eudev (&eudev-version;) - <token>&eudev-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&eudev-home;"/></para>
-        <para>Download: <ulink url="&eudev-url;"/></para>
-        <para>MD5 sum: <literal>&eudev-md5;</literal></para>
+      <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>
@@ -250,4 +277,13 @@
 
     <varlistentry>
+      <term>Gperf (&gperf-version;) - <token>&gperf-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&gperf-home;"/></para>
+        <para>Download: <ulink url="&gperf-url;"/></para>
+        <para>MD5 sum: <literal>&gperf-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Grep (&grep-version;) - <token>&grep-size;</token>:</term>
       <listitem>
@@ -286,4 +322,13 @@
 
     <varlistentry>
+      <term>Intltool (&intltool-version;) - <token>&intltool-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&intltool-home;"/></para>
+        <para>Download: <ulink url="&intltool-url;"/></para>
+        <para>MD5 sum: <literal>&intltool-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
       <listitem>
@@ -340,18 +385,9 @@
 
     <varlistentry>
-      <term>Libee (&libee-version;) - <token>&libee-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libee-home;"/></para>
-        <para>Download: <ulink url="&libee-url;"/></para>
-        <para>MD5 sum: <literal>&libee-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Libestr (&libestr-version;) - <token>&libestr-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libestr-home;"/></para>
-        <para>Download: <ulink url="&libestr-url;"/></para>
-        <para>MD5 sum: <literal>&libestr-md5;</literal></para>
+      <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>
@@ -493,13 +529,4 @@
 
     <varlistentry>
-      <term>Rsyslog (&rsyslog-version;) - <token>&rsyslog-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&rsyslog-home;"/></para>
-        <para>Download: <ulink url="&rsyslog-url;"/></para>
-        <para>MD5 sum: <literal>&rsyslog-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Sed (&sed-version;) - <token>&sed-size;</token>:</term>
       <listitem>
@@ -525,4 +552,13 @@
         <para>Download: <ulink url="&sysvinit-url;"/></para>
         <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <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>
@@ -579,4 +615,13 @@
         <para>Download: <ulink url="&vim-url;"/></para>
         <para>MD5 sum: <literal>&vim-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>XML::Parser  (&xml-parser-version;) - <token>&xml-parser-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&xml-parser-home;"/></para>
+        <para>Download: <ulink url="&xml-parser-url;"/></para>
+        <para>MD5 sum: <literal>&xml-parser-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/materials/common/patches.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -94,4 +94,13 @@
 
     <varlistentry>
+      <term>Libcap UAPI Patch - <token>&libcap-uapi-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&libcap-uapi-patch;"/></para>
+        <para>MD5 sum: <literal>&libcap-uapi-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Man i18n Patch - <token>&man-i18n-patch-size;</token>:</term>
       <listitem>
Index: BOOK/network/common/hostname.xml
===================================================================
--- BOOK/network/common/hostname.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/network/common/hostname.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -17,10 +17,10 @@
   <para>Part of the job of the <command>localnet</command> script is
   setting the system's hostname. This needs to be configured in the
-  <filename>/etc/sysconfig/network</filename> file.</para>
+  <filename>/etc/hostname</filename> file.</para>
 
-  <para>Create the <filename>/etc/sysconfig/network</filename> file
+  <para>Create the <filename>/etc/hostname</filename> file
   and enter a hostname by running:</para>
 
-  <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
+  <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" &gt; /etc/hostname</userinput></screen>
 
   <para><replaceable>[clfs]</replaceable> needs to be replaced with the
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/packages.ent	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -11,4 +11,16 @@
 <!ENTITY aboot-md5 "5f16edbf4e9d52cd191adc4d4b6a5327">
 <!ENTITY aboot-home "http://sourceforge.net/projects/aboot">
+
+<!ENTITY acl-version "2.2.52">
+<!ENTITY acl-size "384 KB">
+<!ENTITY acl-url "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
+<!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
+<!ENTITY acl-home "http://acl.bestbits.at/">
+
+<!ENTITY attr-version "2.4.47">
+<!ENTITY attr-size "340 KB">
+<!ENTITY attr-url "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
+<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
+<!ENTITY attr-home "http://acl.bestbits.at/">
 
 <!ENTITY arcload-version "0.5">
@@ -93,4 +105,10 @@
 <!ENTITY coreutils-md5 "8fb0ae2267aa6e728958adc38f8163a2">
 <!ENTITY coreutils-home "&gnu-software;coreutils">
+
+<!ENTITY dbus-version "1.6.18">
+<!ENTITY dbus-size "1,876 KB">
+<!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
+<!ENTITY dbus-md5 "b02e9c95027a416987b81f9893831061">
+<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
 
 <!ENTITY dejagnu-version "1.5.1">
@@ -139,4 +157,10 @@
 <!ENTITY elftoaout-home " ">
 
+<!ENTITY expat-version "2.1.0">
+<!ENTITY expat-size "556 KB">
+<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.gz">
+<!ENTITY expat-md5 "dd7dab7a5fea97d2a6a43f511449b7cd">
+<!ENTITY expat-home " ">
+
 <!ENTITY expect-version "5.45">
 <!ENTITY expect-size "616 KB">
@@ -189,4 +213,10 @@
 <!ENTITY gmp-home "http://gmplib.org/">
 
+<!ENTITY gperf-version "3.0.4">
+<!ENTITY gperf-size "968 KB">
+<!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz">
+<!ENTITY gperf-md5 "c1f1db32fb6598d6a93e6e88796a8632">
+<!ENTITY gperf-home "&gnu-software;gperf">
+
 <!ENTITY grep-version "2.16">
 <!ENTITY grep-size "1,210 KB">
@@ -227,4 +257,10 @@
 
 
+<!ENTITY intltool-version "0.50.2">
+<!ENTITY intltool-size "192 KB">
+<!ENTITY intltool-url "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
+<!ENTITY intltool-md5 "23fbd879118253cb99aeac067da5f591">
+<!ENTITY intltool-home "http://freedesktop.org/wiki/Software/intltool">
+
 <!ENTITY iproute2-version "3.12.0">
 <!ENTITY iproute2-size "425 KB">
@@ -263,15 +299,9 @@
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less">
 
-<!ENTITY libee-version "0.4.1">
-<!ENTITY libee-size "352 KB">
-<!ENTITY libee-url "http://www.libee.org/download/files/download/libee-&libee-version;.tar.gz">
-<!ENTITY libee-md5 "7bbf4160876c12db6193c06e2badedb2">
-<!ENTITY libee-home "http://www.libee.org/">
-
-<!ENTITY libestr-version "0.1.5">
-<!ENTITY libestr-size "326 KB">
-<!ENTITY libestr-url "http://libestr.adiscon.com/files/download/libestr-&libestr-version;.tar.gz">
-<!ENTITY libestr-md5 "f180c0cdc82883d161eba3f2e8a34eb4">
-<!ENTITY libestr-home "http://libestr.adiscon.com/">
+<!ENTITY libcap-version "2.23">
+<!ENTITY libcap-size "64 KB">
+<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.bz2">
+<!ENTITY libcap-md5 "09a185e4b0aa8a81a51c1e4d0eba7db0">
+<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
 
 <!ENTITY libtool-version "2.4.2">
@@ -380,10 +410,4 @@
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
 
-<!ENTITY rsyslog-version "6.4.2">
-<!ENTITY rsyslog-size "2,519 KB">
-<!ENTITY rsyslog-url "http://www.rsyslog.com/files/download/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
-<!ENTITY rsyslog-md5 "7de0124ec7d67ce2bfda0009ab1263ee">
-<!ENTITY rsyslog-home "http://www.rsyslog.com/">
-
 <!ENTITY sed-version "4.2.2">
 <!ENTITY sed-size "1,036 KB">
@@ -409,4 +433,10 @@
 <!ENTITY sysvinit-md5 "6eda8a97b86e0a6f59dabbf25202aa6f">
 <!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
+
+<!ENTITY systemd-version "208">
+<!ENTITY systemd-size "2,332 KB">
+<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
+<!ENTITY systemd-md5 "df64550d92afbffb4f67a434193ee165">
+<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
 
 <!ENTITY tar-version "1.27.1">
@@ -463,4 +493,10 @@
 <!ENTITY vim-home "http://www.vim.org">
 
+<!ENTITY xml-parser-version "2.42_01">
+<!ENTITY xml-parser-size "240 KB">
+<!ENTITY xml-parser-url "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
+<!ENTITY xml-parser-md5 "a4650aebcc464bb91113c2c356da8210">
+<!ENTITY xml-parser-home "https://github.com/chorny/XML-Parser">
+
 <!ENTITY xz-version "5.0.5">
 <!ENTITY xz-size "908 KB">
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/patches.ent	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -44,4 +44,8 @@
 <!ENTITY iputils-fixes-patch-md5 "a2e77de7fd1fc4417bce0af3e6ffdfcb">
 <!ENTITY iputils-fixes-patch-size "153 KB">
+
+<!ENTITY libcap-uapi-patch "libcap-&libcap-version;-uapi-1.patch">
+<!ENTITY libcap-uapi-patch-md5 "0a84f95ca9906b892880f36c6894c673">
+<!ENTITY libcap-uapi-patch-size "24 KB">
 
 <!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch">
Index: BOOK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/temp-system/common/gettext.xml	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -53,12 +53,13 @@
     </variablelist>
 
-    <para os="f">Compile the package:</para>
+    <para os="f">Compile the required programs and support library:</para>
 
 <screen os="g"><userinput>make -C gnulib-lib
-make -C src msgfmt</userinput></screen>
+make -C src msgfmt msgmerge xgettext</userinput></screen>
 
-    <para os="h">Install the <command>msgfmt</command> binary:</para>
+    <para os="h">Install the <command>msgfmt</command>,
+    <command>msgmerge</command> and <command>xgettext</command> binaries:</para>
 
-<screen os="i"><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
+<screen os="i"><userinput>cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
 
   </sect2>
Index: BOOK/users_groups.ent
===================================================================
--- BOOK/users_groups.ent	(revision 117bccbb1ef872c8007551c2089422142609f784)
+++ BOOK/users_groups.ent	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -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,6 @@
 <!ENTITY gid-console "17">
 <!ENTITY gid-cdrw "18">
+<!ENTITY gid-messagebus "27">
+<!ENTITY gid-systemd-journal "28">
 <!ENTITY gid-mail "30">
 <!ENTITY gid-news "31">
Index: patches/libcap-2.23-uapi-1.patch
===================================================================
--- patches/libcap-2.23-uapi-1.patch	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
+++ patches/libcap-2.23-uapi-1.patch	(revision 8a1e392c9088a82909e70cdf401f4b3bb43fc820)
@@ -0,0 +1,646 @@
+Submitted By: Chris Staub (chris at cross-lfs dot org)
+Date: 2014-01-05
+Initial Package Version: 2.23
+Origin: Upstream
+Upstream Status: Applied
+Description: Fixes libcap headers to allow other programs to link to libcap
+
+diff -Naur libcap-2.23.orig/Make.Rules libcap-2.23/Make.Rules
+--- libcap-2.23.orig/Make.Rules	2013-12-24 14:23:11.000000000 -0500
++++ libcap-2.23/Make.Rules	2014-01-05 01:23:01.000000000 -0500
+@@ -45,8 +45,8 @@
+ 
+ # Compilation specifics
+ 
+-KERNEL_HEADERS := $(topdir)/libcap/include
+-IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
++KERNEL_HEADERS := $(topdir)/libcap/include/uapi
++IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+ CC := gcc
+ CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+diff -Naur libcap-2.23.orig/libcap/Makefile libcap-2.23/libcap/Makefile
+--- libcap-2.23.orig/libcap/Makefile	2013-12-24 12:08:53.000000000 -0500
++++ libcap-2.23/libcap/Makefile	2014-01-05 01:23:01.000000000 -0500
+@@ -53,7 +53,7 @@
+ 
+ cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
+ 	@echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
+-	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(KERNEL_HEADERS)/uapi/linux/capability.h | fgrep -v 0x > $@
++	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@
+ 
+ $(STALIBNAME): $(OBJS)
+ 	$(AR) rcs $@ $^
+diff -Naur libcap-2.23.orig/libcap/include/linux/capability.h libcap-2.23/libcap/include/linux/capability.h
+--- libcap-2.23.orig/libcap/include/linux/capability.h	2013-12-15 23:47:10.000000000 -0500
++++ libcap-2.23/libcap/include/linux/capability.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,219 +0,0 @@
+-/*
+- * This is <linux/capability.h>
+- *
+- * Andrew G. Morgan <morgan@kernel.org>
+- * Alexander Kjeldaas <astor@guardian.no>
+- * with help from Aleph1, Roland Buresund and Andrew Main.
+- *
+- * See here for the libcap library ("POSIX draft" compliance):
+- *
+- * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
+- */
+-#ifndef _LINUX_CAPABILITY_H
+-#define _LINUX_CAPABILITY_H
+-
+-#include <uapi/linux/capability.h>
+-
+-
+-#define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
+-#define _KERNEL_CAPABILITY_U32S    _LINUX_CAPABILITY_U32S_3
+-
+-extern int file_caps_enabled;
+-
+-typedef struct kernel_cap_struct {
+-	__u32 cap[_KERNEL_CAPABILITY_U32S];
+-} kernel_cap_t;
+-
+-/* exact same as vfs_cap_data but in cpu endian and always filled completely */
+-struct cpu_vfs_cap_data {
+-	__u32 magic_etc;
+-	kernel_cap_t permitted;
+-	kernel_cap_t inheritable;
+-};
+-
+-#define _USER_CAP_HEADER_SIZE  (sizeof(struct __user_cap_header_struct))
+-#define _KERNEL_CAP_T_SIZE     (sizeof(kernel_cap_t))
+-
+-
+-struct file;
+-struct inode;
+-struct dentry;
+-struct user_namespace;
+-
+-struct user_namespace *current_user_ns(void);
+-
+-extern const kernel_cap_t __cap_empty_set;
+-extern const kernel_cap_t __cap_init_eff_set;
+-
+-/*
+- * Internal kernel functions only
+- */
+-
+-#define CAP_FOR_EACH_U32(__capi)  \
+-	for (__capi = 0; __capi < _KERNEL_CAPABILITY_U32S; ++__capi)
+-
+-/*
+- * CAP_FS_MASK and CAP_NFSD_MASKS:
+- *
+- * The fs mask is all the privileges that fsuid==0 historically meant.
+- * At one time in the past, that included CAP_MKNOD and CAP_LINUX_IMMUTABLE.
+- *
+- * It has never meant setting security.* and trusted.* xattrs.
+- *
+- * We could also define fsmask as follows:
+- *   1. CAP_FS_MASK is the privilege to bypass all fs-related DAC permissions
+- *   2. The security.* and trusted.* xattrs are fs-related MAC permissions
+- */
+-
+-# define CAP_FS_MASK_B0     (CAP_TO_MASK(CAP_CHOWN)		\
+-			    | CAP_TO_MASK(CAP_MKNOD)		\
+-			    | CAP_TO_MASK(CAP_DAC_OVERRIDE)	\
+-			    | CAP_TO_MASK(CAP_DAC_READ_SEARCH)	\
+-			    | CAP_TO_MASK(CAP_FOWNER)		\
+-			    | CAP_TO_MASK(CAP_FSETID))
+-
+-# define CAP_FS_MASK_B1     (CAP_TO_MASK(CAP_MAC_OVERRIDE))
+-
+-#if _KERNEL_CAPABILITY_U32S != 2
+-# error Fix up hand-coded capability macro initializers
+-#else /* HAND-CODED capability initializers */
+-
+-# define CAP_EMPTY_SET    ((kernel_cap_t){{ 0, 0 }})
+-# define CAP_FULL_SET     ((kernel_cap_t){{ ~0, ~0 }})
+-# define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0 \
+-				    | CAP_TO_MASK(CAP_LINUX_IMMUTABLE), \
+-				    CAP_FS_MASK_B1 } })
+-# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0 \
+-				    | CAP_TO_MASK(CAP_SYS_RESOURCE), \
+-				    CAP_FS_MASK_B1 } })
+-
+-#endif /* _KERNEL_CAPABILITY_U32S != 2 */
+-
+-# define cap_clear(c)         do { (c) = __cap_empty_set; } while (0)
+-
+-#define cap_raise(c, flag)  ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag))
+-#define cap_lower(c, flag)  ((c).cap[CAP_TO_INDEX(flag)] &= ~CAP_TO_MASK(flag))
+-#define cap_raised(c, flag) ((c).cap[CAP_TO_INDEX(flag)] & CAP_TO_MASK(flag))
+-
+-#define CAP_BOP_ALL(c, a, b, OP)                                    \
+-do {                                                                \
+-	unsigned __capi;                                            \
+-	CAP_FOR_EACH_U32(__capi) {                                  \
+-		c.cap[__capi] = a.cap[__capi] OP b.cap[__capi];     \
+-	}                                                           \
+-} while (0)
+-
+-#define CAP_UOP_ALL(c, a, OP)                                       \
+-do {                                                                \
+-	unsigned __capi;                                            \
+-	CAP_FOR_EACH_U32(__capi) {                                  \
+-		c.cap[__capi] = OP a.cap[__capi];                   \
+-	}                                                           \
+-} while (0)
+-
+-static inline kernel_cap_t cap_combine(const kernel_cap_t a,
+-				       const kernel_cap_t b)
+-{
+-	kernel_cap_t dest;
+-	CAP_BOP_ALL(dest, a, b, |);
+-	return dest;
+-}
+-
+-static inline kernel_cap_t cap_intersect(const kernel_cap_t a,
+-					 const kernel_cap_t b)
+-{
+-	kernel_cap_t dest;
+-	CAP_BOP_ALL(dest, a, b, &);
+-	return dest;
+-}
+-
+-static inline kernel_cap_t cap_drop(const kernel_cap_t a,
+-				    const kernel_cap_t drop)
+-{
+-	kernel_cap_t dest;
+-	CAP_BOP_ALL(dest, a, drop, &~);
+-	return dest;
+-}
+-
+-static inline kernel_cap_t cap_invert(const kernel_cap_t c)
+-{
+-	kernel_cap_t dest;
+-	CAP_UOP_ALL(dest, c, ~);
+-	return dest;
+-}
+-
+-static inline int cap_isclear(const kernel_cap_t a)
+-{
+-	unsigned __capi;
+-	CAP_FOR_EACH_U32(__capi) {
+-		if (a.cap[__capi] != 0)
+-			return 0;
+-	}
+-	return 1;
+-}
+-
+-/*
+- * Check if "a" is a subset of "set".
+- * return 1 if ALL of the capabilities in "a" are also in "set"
+- *	cap_issubset(0101, 1111) will return 1
+- * return 0 if ANY of the capabilities in "a" are not in "set"
+- *	cap_issubset(1111, 0101) will return 0
+- */
+-static inline int cap_issubset(const kernel_cap_t a, const kernel_cap_t set)
+-{
+-	kernel_cap_t dest;
+-	dest = cap_drop(a, set);
+-	return cap_isclear(dest);
+-}
+-
+-/* Used to decide between falling back on the old suser() or fsuser(). */
+-
+-static inline int cap_is_fs_cap(int cap)
+-{
+-	const kernel_cap_t __cap_fs_set = CAP_FS_SET;
+-	return !!(CAP_TO_MASK(cap) & __cap_fs_set.cap[CAP_TO_INDEX(cap)]);
+-}
+-
+-static inline kernel_cap_t cap_drop_fs_set(const kernel_cap_t a)
+-{
+-	const kernel_cap_t __cap_fs_set = CAP_FS_SET;
+-	return cap_drop(a, __cap_fs_set);
+-}
+-
+-static inline kernel_cap_t cap_raise_fs_set(const kernel_cap_t a,
+-					    const kernel_cap_t permitted)
+-{
+-	const kernel_cap_t __cap_fs_set = CAP_FS_SET;
+-	return cap_combine(a,
+-			   cap_intersect(permitted, __cap_fs_set));
+-}
+-
+-static inline kernel_cap_t cap_drop_nfsd_set(const kernel_cap_t a)
+-{
+-	const kernel_cap_t __cap_fs_set = CAP_NFSD_SET;
+-	return cap_drop(a, __cap_fs_set);
+-}
+-
+-static inline kernel_cap_t cap_raise_nfsd_set(const kernel_cap_t a,
+-					      const kernel_cap_t permitted)
+-{
+-	const kernel_cap_t __cap_nfsd_set = CAP_NFSD_SET;
+-	return cap_combine(a,
+-			   cap_intersect(permitted, __cap_nfsd_set));
+-}
+-
+-extern bool has_capability(struct task_struct *t, int cap);
+-extern bool has_ns_capability(struct task_struct *t,
+-			      struct user_namespace *ns, int cap);
+-extern bool has_capability_noaudit(struct task_struct *t, int cap);
+-extern bool has_ns_capability_noaudit(struct task_struct *t,
+-				      struct user_namespace *ns, int cap);
+-extern bool capable(int cap);
+-extern bool ns_capable(struct user_namespace *ns, int cap);
+-extern bool inode_capable(const struct inode *inode, int cap);
+-extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
+-
+-/* audit system wants to get cap info from files as well */
+-extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
+-
+-#endif /* !_LINUX_CAPABILITY_H */
+diff -Naur libcap-2.23.orig/libcap/include/linux/prctl.h libcap-2.23/libcap/include/linux/prctl.h
+--- libcap-2.23.orig/libcap/include/linux/prctl.h	2013-12-15 23:46:28.000000000 -0500
++++ libcap-2.23/libcap/include/linux/prctl.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,105 +0,0 @@
+-#ifndef _LINUX_PRCTL_H
+-#define _LINUX_PRCTL_H
+-
+-/* Values to pass as first argument to prctl() */
+-
+-#define PR_SET_PDEATHSIG  1  /* Second arg is a signal */
+-#define PR_GET_PDEATHSIG  2  /* Second arg is a ptr to return the signal */
+-
+-/* Get/set current->mm->dumpable */
+-#define PR_GET_DUMPABLE   3
+-#define PR_SET_DUMPABLE   4
+-
+-/* Get/set unaligned access control bits (if meaningful) */
+-#define PR_GET_UNALIGN	  5
+-#define PR_SET_UNALIGN	  6
+-# define PR_UNALIGN_NOPRINT	1	/* silently fix up unaligned user accesses */
+-# define PR_UNALIGN_SIGBUS	2	/* generate SIGBUS on unaligned user access */
+-
+-/* Get/set whether or not to drop capabilities on setuid() away from
+- * uid 0 (as per security/commoncap.c) */
+-#define PR_GET_KEEPCAPS   7
+-#define PR_SET_KEEPCAPS   8
+-
+-/* Get/set floating-point emulation control bits (if meaningful) */
+-#define PR_GET_FPEMU  9
+-#define PR_SET_FPEMU 10
+-# define PR_FPEMU_NOPRINT	1	/* silently emulate fp operations accesses */
+-# define PR_FPEMU_SIGFPE	2	/* don't emulate fp operations, send SIGFPE instead */
+-
+-/* Get/set floating-point exception mode (if meaningful) */
+-#define PR_GET_FPEXC	11
+-#define PR_SET_FPEXC	12
+-# define PR_FP_EXC_SW_ENABLE	0x80	/* Use FPEXC for FP exception enables */
+-# define PR_FP_EXC_DIV		0x010000	/* floating point divide by zero */
+-# define PR_FP_EXC_OVF		0x020000	/* floating point overflow */
+-# define PR_FP_EXC_UND		0x040000	/* floating point underflow */
+-# define PR_FP_EXC_RES		0x080000	/* floating point inexact result */
+-# define PR_FP_EXC_INV		0x100000	/* floating point invalid operation */
+-# define PR_FP_EXC_DISABLED	0	/* FP exceptions disabled */
+-# define PR_FP_EXC_NONRECOV	1	/* async non-recoverable exc. mode */
+-# define PR_FP_EXC_ASYNC	2	/* async recoverable exception mode */
+-# define PR_FP_EXC_PRECISE	3	/* precise exception mode */
+-
+-/* Get/set whether we use statistical process timing or accurate timestamp
+- * based process timing */
+-#define PR_GET_TIMING   13
+-#define PR_SET_TIMING   14
+-# define PR_TIMING_STATISTICAL  0       /* Normal, traditional,
+-                                                   statistical process timing */
+-# define PR_TIMING_TIMESTAMP    1       /* Accurate timestamp based
+-                                                   process timing */
+-
+-#define PR_SET_NAME    15		/* Set process name */
+-#define PR_GET_NAME    16		/* Get process name */
+-
+-/* Get/set process endian */
+-#define PR_GET_ENDIAN	19
+-#define PR_SET_ENDIAN	20
+-# define PR_ENDIAN_BIG		0
+-# define PR_ENDIAN_LITTLE	1	/* True little endian mode */
+-# define PR_ENDIAN_PPC_LITTLE	2	/* "PowerPC" pseudo little endian */
+-
+-/* Get/set process seccomp mode */
+-#define PR_GET_SECCOMP	21
+-#define PR_SET_SECCOMP	22
+-
+-/* Get/set the capability bounding set (as per security/commoncap.c) */
+-#define PR_CAPBSET_READ 23
+-#define PR_CAPBSET_DROP 24
+-
+-/* Get/set the process' ability to use the timestamp counter instruction */
+-#define PR_GET_TSC 25
+-#define PR_SET_TSC 26
+-# define PR_TSC_ENABLE		1	/* allow the use of the timestamp counter */
+-# define PR_TSC_SIGSEGV		2	/* throw a SIGSEGV instead of reading the TSC */
+-
+-/* Get/set securebits (as per security/commoncap.c) */
+-#define PR_GET_SECUREBITS 27
+-#define PR_SET_SECUREBITS 28
+-
+-/*
+- * Get/set the timerslack as used by poll/select/nanosleep
+- * A value of 0 means "use default"
+- */
+-#define PR_SET_TIMERSLACK 29
+-#define PR_GET_TIMERSLACK 30
+-
+-#define PR_TASK_PERF_EVENTS_DISABLE		31
+-#define PR_TASK_PERF_EVENTS_ENABLE		32
+-
+-/*
+- * Set early/late kill mode for hwpoison memory corruption.
+- * This influences when the process gets killed on a memory corruption.
+- */
+-#define PR_MCE_KILL	33
+-# define PR_MCE_KILL_CLEAR   0
+-# define PR_MCE_KILL_SET     1
+-
+-# define PR_MCE_KILL_LATE    0
+-# define PR_MCE_KILL_EARLY   1
+-# define PR_MCE_KILL_DEFAULT 2
+-
+-#define PR_MCE_KILL_GET 34
+-
+-#endif /* _LINUX_PRCTL_H */
+diff -Naur libcap-2.23.orig/libcap/include/linux/securebits.h libcap-2.23/libcap/include/linux/securebits.h
+--- libcap-2.23.orig/libcap/include/linux/securebits.h	2013-12-15 23:46:28.000000000 -0500
++++ libcap-2.23/libcap/include/linux/securebits.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,54 +0,0 @@
+-#ifndef _LINUX_SECUREBITS_H
+-#define _LINUX_SECUREBITS_H 1
+-
+-/* Each securesetting is implemented using two bits. One bit specifies
+-   whether the setting is on or off. The other bit specify whether the
+-   setting is locked or not. A setting which is locked cannot be
+-   changed from user-level. */
+-#define issecure_mask(X)	(1 << (X))
+-#ifdef __KERNEL__
+-#define issecure(X)		(issecure_mask(X) & current_cred_xxx(securebits))
+-#endif
+-
+-#define SECUREBITS_DEFAULT 0x00000000
+-
+-/* When set UID 0 has no special privileges. When unset, we support
+-   inheritance of root-permissions and suid-root executable under
+-   compatibility mode. We raise the effective and inheritable bitmasks
+-   *of the executable file* if the effective uid of the new process is
+-   0. If the real uid is 0, we raise the effective (legacy) bit of the
+-   executable file. */
+-#define SECURE_NOROOT			0
+-#define SECURE_NOROOT_LOCKED		1  /* make bit-0 immutable */
+-
+-#define SECBIT_NOROOT		(issecure_mask(SECURE_NOROOT))
+-#define SECBIT_NOROOT_LOCKED	(issecure_mask(SECURE_NOROOT_LOCKED))
+-
+-/* When set, setuid to/from uid 0 does not trigger capability-"fixup".
+-   When unset, to provide compatiblility with old programs relying on
+-   set*uid to gain/lose privilege, transitions to/from uid 0 cause
+-   capabilities to be gained/lost. */
+-#define SECURE_NO_SETUID_FIXUP		2
+-#define SECURE_NO_SETUID_FIXUP_LOCKED	3  /* make bit-2 immutable */
+-
+-#define SECBIT_NO_SETUID_FIXUP	(issecure_mask(SECURE_NO_SETUID_FIXUP))
+-#define SECBIT_NO_SETUID_FIXUP_LOCKED \
+-			(issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED))
+-
+-/* When set, a process can retain its capabilities even after
+-   transitioning to a non-root user (the set-uid fixup suppressed by
+-   bit 2). Bit-4 is cleared when a process calls exec(); setting both
+-   bit 4 and 5 will create a barrier through exec that no exec()'d
+-   child can use this feature again. */
+-#define SECURE_KEEP_CAPS		4
+-#define SECURE_KEEP_CAPS_LOCKED		5  /* make bit-4 immutable */
+-
+-#define SECBIT_KEEP_CAPS	(issecure_mask(SECURE_KEEP_CAPS))
+-#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
+-
+-#define SECURE_ALL_BITS		(issecure_mask(SECURE_NOROOT) | \
+-				 issecure_mask(SECURE_NO_SETUID_FIXUP) | \
+-				 issecure_mask(SECURE_KEEP_CAPS))
+-#define SECURE_ALL_LOCKS	(SECURE_ALL_BITS << 1)
+-
+-#endif /* !_LINUX_SECUREBITS_H */
+diff -Naur libcap-2.23.orig/libcap/include/sys/capability.h libcap-2.23/libcap/include/sys/capability.h
+--- libcap-2.23.orig/libcap/include/sys/capability.h	2013-12-15 23:47:10.000000000 -0500
++++ libcap-2.23/libcap/include/sys/capability.h	2014-01-05 01:23:01.000000000 -0500
+@@ -26,7 +26,7 @@
+ #ifndef __user
+ #define __user
+ #endif
+-#include <uapi/linux/capability.h>
++#include <linux/capability.h>
+ #include <linux/xattr.h>
+ 
+ /*
+diff -Naur libcap-2.23.orig/libcap/include/uapi/linux/prctl.h libcap-2.23/libcap/include/uapi/linux/prctl.h
+--- libcap-2.23.orig/libcap/include/uapi/linux/prctl.h	1969-12-31 19:00:00.000000000 -0500
++++ libcap-2.23/libcap/include/uapi/linux/prctl.h	2014-01-05 01:23:01.000000000 -0500
+@@ -0,0 +1,152 @@
++#ifndef _LINUX_PRCTL_H
++#define _LINUX_PRCTL_H
++
++/* Values to pass as first argument to prctl() */
++
++#define PR_SET_PDEATHSIG  1  /* Second arg is a signal */
++#define PR_GET_PDEATHSIG  2  /* Second arg is a ptr to return the signal */
++
++/* Get/set current->mm->dumpable */
++#define PR_GET_DUMPABLE   3
++#define PR_SET_DUMPABLE   4
++
++/* Get/set unaligned access control bits (if meaningful) */
++#define PR_GET_UNALIGN	  5
++#define PR_SET_UNALIGN	  6
++# define PR_UNALIGN_NOPRINT	1	/* silently fix up unaligned user accesses */
++# define PR_UNALIGN_SIGBUS	2	/* generate SIGBUS on unaligned user access */
++
++/* Get/set whether or not to drop capabilities on setuid() away from
++ * uid 0 (as per security/commoncap.c) */
++#define PR_GET_KEEPCAPS   7
++#define PR_SET_KEEPCAPS   8
++
++/* Get/set floating-point emulation control bits (if meaningful) */
++#define PR_GET_FPEMU  9
++#define PR_SET_FPEMU 10
++# define PR_FPEMU_NOPRINT	1	/* silently emulate fp operations accesses */
++# define PR_FPEMU_SIGFPE	2	/* don't emulate fp operations, send SIGFPE instead */
++
++/* Get/set floating-point exception mode (if meaningful) */
++#define PR_GET_FPEXC	11
++#define PR_SET_FPEXC	12
++# define PR_FP_EXC_SW_ENABLE	0x80	/* Use FPEXC for FP exception enables */
++# define PR_FP_EXC_DIV		0x010000	/* floating point divide by zero */
++# define PR_FP_EXC_OVF		0x020000	/* floating point overflow */
++# define PR_FP_EXC_UND		0x040000	/* floating point underflow */
++# define PR_FP_EXC_RES		0x080000	/* floating point inexact result */
++# define PR_FP_EXC_INV		0x100000	/* floating point invalid operation */
++# define PR_FP_EXC_DISABLED	0	/* FP exceptions disabled */
++# define PR_FP_EXC_NONRECOV	1	/* async non-recoverable exc. mode */
++# define PR_FP_EXC_ASYNC	2	/* async recoverable exception mode */
++# define PR_FP_EXC_PRECISE	3	/* precise exception mode */
++
++/* Get/set whether we use statistical process timing or accurate timestamp
++ * based process timing */
++#define PR_GET_TIMING   13
++#define PR_SET_TIMING   14
++# define PR_TIMING_STATISTICAL  0       /* Normal, traditional,
++                                                   statistical process timing */
++# define PR_TIMING_TIMESTAMP    1       /* Accurate timestamp based
++                                                   process timing */
++
++#define PR_SET_NAME    15		/* Set process name */
++#define PR_GET_NAME    16		/* Get process name */
++
++/* Get/set process endian */
++#define PR_GET_ENDIAN	19
++#define PR_SET_ENDIAN	20
++# define PR_ENDIAN_BIG		0
++# define PR_ENDIAN_LITTLE	1	/* True little endian mode */
++# define PR_ENDIAN_PPC_LITTLE	2	/* "PowerPC" pseudo little endian */
++
++/* Get/set process seccomp mode */
++#define PR_GET_SECCOMP	21
++#define PR_SET_SECCOMP	22
++
++/* Get/set the capability bounding set (as per security/commoncap.c) */
++#define PR_CAPBSET_READ 23
++#define PR_CAPBSET_DROP 24
++
++/* Get/set the process' ability to use the timestamp counter instruction */
++#define PR_GET_TSC 25
++#define PR_SET_TSC 26
++# define PR_TSC_ENABLE		1	/* allow the use of the timestamp counter */
++# define PR_TSC_SIGSEGV		2	/* throw a SIGSEGV instead of reading the TSC */
++
++/* Get/set securebits (as per security/commoncap.c) */
++#define PR_GET_SECUREBITS 27
++#define PR_SET_SECUREBITS 28
++
++/*
++ * Get/set the timerslack as used by poll/select/nanosleep
++ * A value of 0 means "use default"
++ */
++#define PR_SET_TIMERSLACK 29
++#define PR_GET_TIMERSLACK 30
++
++#define PR_TASK_PERF_EVENTS_DISABLE		31
++#define PR_TASK_PERF_EVENTS_ENABLE		32
++
++/*
++ * Set early/late kill mode for hwpoison memory corruption.
++ * This influences when the process gets killed on a memory corruption.
++ */
++#define PR_MCE_KILL	33
++# define PR_MCE_KILL_CLEAR   0
++# define PR_MCE_KILL_SET     1
++
++# define PR_MCE_KILL_LATE    0
++# define PR_MCE_KILL_EARLY   1
++# define PR_MCE_KILL_DEFAULT 2
++
++#define PR_MCE_KILL_GET 34
++
++/*
++ * Tune up process memory map specifics.
++ */
++#define PR_SET_MM		35
++# define PR_SET_MM_START_CODE		1
++# define PR_SET_MM_END_CODE		2
++# define PR_SET_MM_START_DATA		3
++# define PR_SET_MM_END_DATA		4
++# define PR_SET_MM_START_STACK		5
++# define PR_SET_MM_START_BRK		6
++# define PR_SET_MM_BRK			7
++# define PR_SET_MM_ARG_START		8
++# define PR_SET_MM_ARG_END		9
++# define PR_SET_MM_ENV_START		10
++# define PR_SET_MM_ENV_END		11
++# define PR_SET_MM_AUXV			12
++# define PR_SET_MM_EXE_FILE		13
++
++/*
++ * Set specific pid that is allowed to ptrace the current task.
++ * A value of 0 mean "no process".
++ */
++#define PR_SET_PTRACER 0x59616d61
++# define PR_SET_PTRACER_ANY ((unsigned long)-1)
++
++#define PR_SET_CHILD_SUBREAPER	36
++#define PR_GET_CHILD_SUBREAPER	37
++
++/*
++ * If no_new_privs is set, then operations that grant new privileges (i.e.
++ * execve) will either fail or not grant them.  This affects suid/sgid,
++ * file capabilities, and LSMs.
++ *
++ * Operations that merely manipulate or drop existing privileges (setresuid,
++ * capset, etc.) will still work.  Drop those privileges if you want them gone.
++ *
++ * Changing LSM security domain is considered a new privilege.  So, for example,
++ * asking selinux for a specific new context (e.g. with runcon) will result
++ * in execve returning -EPERM.
++ *
++ * See Documentation/prctl/no_new_privs.txt for more details.
++ */
++#define PR_SET_NO_NEW_PRIVS	38
++#define PR_GET_NO_NEW_PRIVS	39
++
++#define PR_GET_TID_ADDRESS	40
++
++#endif /* _LINUX_PRCTL_H */
+diff -Naur libcap-2.23.orig/libcap/include/uapi/linux/securebits.h libcap-2.23/libcap/include/uapi/linux/securebits.h
+--- libcap-2.23.orig/libcap/include/uapi/linux/securebits.h	1969-12-31 19:00:00.000000000 -0500
++++ libcap-2.23/libcap/include/uapi/linux/securebits.h	2014-01-05 01:23:01.000000000 -0500
+@@ -0,0 +1,51 @@
++#ifndef _UAPI_LINUX_SECUREBITS_H
++#define _UAPI_LINUX_SECUREBITS_H
++
++/* Each securesetting is implemented using two bits. One bit specifies
++   whether the setting is on or off. The other bit specify whether the
++   setting is locked or not. A setting which is locked cannot be
++   changed from user-level. */
++#define issecure_mask(X)	(1 << (X))
++
++#define SECUREBITS_DEFAULT 0x00000000
++
++/* When set UID 0 has no special privileges. When unset, we support
++   inheritance of root-permissions and suid-root executable under
++   compatibility mode. We raise the effective and inheritable bitmasks
++   *of the executable file* if the effective uid of the new process is
++   0. If the real uid is 0, we raise the effective (legacy) bit of the
++   executable file. */
++#define SECURE_NOROOT			0
++#define SECURE_NOROOT_LOCKED		1  /* make bit-0 immutable */
++
++#define SECBIT_NOROOT		(issecure_mask(SECURE_NOROOT))
++#define SECBIT_NOROOT_LOCKED	(issecure_mask(SECURE_NOROOT_LOCKED))
++
++/* When set, setuid to/from uid 0 does not trigger capability-"fixup".
++   When unset, to provide compatiblility with old programs relying on
++   set*uid to gain/lose privilege, transitions to/from uid 0 cause
++   capabilities to be gained/lost. */
++#define SECURE_NO_SETUID_FIXUP		2
++#define SECURE_NO_SETUID_FIXUP_LOCKED	3  /* make bit-2 immutable */
++
++#define SECBIT_NO_SETUID_FIXUP	(issecure_mask(SECURE_NO_SETUID_FIXUP))
++#define SECBIT_NO_SETUID_FIXUP_LOCKED \
++			(issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED))
++
++/* When set, a process can retain its capabilities even after
++   transitioning to a non-root user (the set-uid fixup suppressed by
++   bit 2). Bit-4 is cleared when a process calls exec(); setting both
++   bit 4 and 5 will create a barrier through exec that no exec()'d
++   child can use this feature again. */
++#define SECURE_KEEP_CAPS		4
++#define SECURE_KEEP_CAPS_LOCKED		5  /* make bit-4 immutable */
++
++#define SECBIT_KEEP_CAPS	(issecure_mask(SECURE_KEEP_CAPS))
++#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
++
++#define SECURE_ALL_BITS		(issecure_mask(SECURE_NOROOT) | \
++				 issecure_mask(SECURE_NO_SETUID_FIXUP) | \
++				 issecure_mask(SECURE_KEEP_CAPS))
++#define SECURE_ALL_LOCKS	(SECURE_ALL_BITS << 1)
++
++#endif /* _UAPI_LINUX_SECUREBITS_H */
