Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/appendices/dependencies/common.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -31,4 +31,60 @@
   </para>
 
+<!-- Begin Acl dependency info -->
+  <bridgehead renderas="sect2" id="acl-dep">Acl</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
+         Libtool, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Coreutils, Gettext, Libcap, Sed, Systemd, Tar, Vim</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Attr dependency info -->
+  <bridgehead renderas="sect2" id="attr-dep">Attr</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
+         Libtool, Make, Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Acl, Coretutils, Gettext, Libcap, Sed, Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Autoconf dependency info -->
   <bridgehead renderas="sect2" id="autoconf-dep">Autoconf</bridgehead>
@@ -288,6 +344,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, GMP, Grep, Make,
-         Patch, Perl, Sed, Texinfo</seg>
+         <seg>Acl, Attr, Bash, Binutils, Coreutils, Glibc, Gawk, GCC, GMP,
+         Grep, Libcap, Make, Patch, Perl, Sed, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -899,5 +955,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Libcap, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1031,4 +1087,31 @@
       </segmentedlist>
 
+<!-- Begin Libcap dependency info -->
+  <bridgehead renderas="sect2" id="libcap-dep">Libcap</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Coreutils, IPutils, Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin libee dependency info -->
   <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
@@ -1365,32 +1448,4 @@
       </segmentedlist>
 
-<!-- Begin KMOD dependency info -->
-  <bridgehead renderas="sect2" id="module-init-tools-dep">KMOD</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, Findutils, GCC, Grep, Make,
-         Sed, Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, File, Gawk, Gzip</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Ncurses dependency info -->
   <bridgehead renderas="sect2" id="ncurses-dep">Ncurses</bridgehead>
@@ -1501,5 +1556,5 @@
 
         <seglistitem>
-          <seg>Util-linux, E2fsprogs</seg>
+          <seg>E2fsprogs, Util-linux</seg>
         </seglistitem>
       </segmentedlist>
@@ -1623,5 +1678,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
+         <seg>Acl, Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
          Sed, Texinfo</seg>
         </seglistitem>
@@ -1651,6 +1706,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
-         Gettext, Grep, Make, Sed</seg>
+         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Glibc,
+         Findutils, Gawk, GCC, Gettext, Grep, Make, Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1706,5 +1761,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC,
+         <seg>Acl, Attr, Bash, Binutils, Bison, Coreutils, Glibc, GCC,
          Grep, Make, Sed, Texinfo</seg>
         </seglistitem>
@@ -1846,6 +1901,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
-         Gettext, Grep, Make, Ncurses, Perl, Sed</seg>
+         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Glibc,
+         Findutils, Gawk, GCC, Gettext, Grep, Make, Ncurses, Perl, Sed</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/final-system/common/acl.xml
===================================================================
--- BOOK/final-system/common/acl.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/common/acl.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,137 @@
+<?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="s1">Apply a sed for a test:</para>
+
+<screen os="s2"><userinput>sed -i -e "/TABS-1;/a if (x > (TABS-1)) x = (TABS-1);" \
+    libacl/__acl_to_any_text.c</userinput></screen>
+
+    <para os="a">Apply a sed to install the documentation with a versioned
+    directory:</para>
+
+<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
+
+    <para os="c">Apply a sed to fix a few tests:</para>
+
+<screen os="d"><userinput>sed -i "s:| sed.*::g" test/{sbits-restore,cp,misc}.test</userinput></screen>
+
+    <para os="e">Prepare Acl for compilation:</para>
+
+<screen os="f"><userinput>./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib</userinput></screen>
+
+    <para os="g">Compile the package:</para>
+
+<screen os="h"><userinput>make</userinput></screen>
+
+    <para os="i">The Acl tests need a filesystem which supports access controls
+    after Coreutils has been built with the Acl libraries. Return to this
+    section after Coreutils has been installed. Test the results:</para>
+
+<screen os="j"><userinput remap="test">make tests</userinput></screen>
+
+    <para os="k">Install the package:</para>
+
+<screen os="l"><userinput>make install install-dev install-lib</userinput></screen>
+
+    <para os="m">Move the shared library to <filename class="directory">/lib</filename>
+    and recreate the symlink in <filename class="directory">/usr/lib</filename>:</para>
+
+<screen os="n"><userinput>mv -v /usr/lib/libacl.so.* /lib
+ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so</userinput></screen>
+
+    <para os="o">Set the proper permissions on the shared library:</para>
+
+<screen os="p"><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-&acl-version;</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 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/common/attr.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,133 @@
+<?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="s1">Apply a sed which prevents man-pages which were installed by
+    the <xref linkend="ch-system-man-pages"/> package:</para>
+
+<screen os="s2"><userinput>sed -i -e "/SUBDIRS/s|man[25]||g" man/Makefile</userinput></screen>
+
+    <para os="a">Apply a sed to install the documentation with a versioned
+    directory:</para>
+
+<screen os="b"><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
+
+    <para os="c">Prepare Attr for compilation:</para>
+
+<screen os="d"><userinput>./configure \
+    --prefix=/usr</userinput></screen>
+
+    <para os="e">Compile the package:</para>
+
+<screen os="f"><userinput>make</userinput></screen>
+
+    <para os="g">The tests need to run with a filesystem which supports extended
+    attributes. Test the results:</para>
+
+<screen os="h"><userinput remap="test">make -j1 tests root-tests</userinput></screen>
+
+    <para os="i">Install the package:</para>
+
+<screen os="j"><userinput>make install install-dev install-lib</userinput></screen>
+
+    <para os="k">Move the shared library to <filename class="directory">/lib
+    </filename> and recreate the symlink in <filename class="directory">/usr/lib
+    </filename>:</para>
+
+<screen os="l"><userinput>mv -v /usr/lib/libattr.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libattr.so) /usr/lib/libattr.so</userinput></screen>
+
+    <para os="m">Set the proper permissions on the shared library:</para>
+
+<screen os="n"><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, /usr/share/doc/attr-&attr-version;</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/libcap.xml
===================================================================
--- BOOK/final-system/common/libcap.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/common/libcap.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-libcap" role="wrap">
+  <?dbhtml filename="libcap.html"?>
+
+  <title>Libcap-&libcap-version;</title>
+
+  <indexterm zone="ch-system-libcap">
+    <primary sortas="a-Libcap">Libcap</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Libcap is a library for getting and setting POSIX.1e
+    (formerly POSIX 6) draft 15 capabilities.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libcap</title>
+
+    <para os="a">Compile the package:</para>
+
+<screen os="b"><userinput>make</userinput></screen>
+
+    <para os="c">This package does not come with a test suite.</para>
+
+    <para os="d">Install the package:</para>
+
+<screen os="e"><userinput>make RAISE_SETFCAP=no install
+chmod -v 755 /lib/libcap.so.&libcap-version;
+ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
+rm -v /lib/libcap.so
+mv -v /lib/libcap.a /usr/lib</userinput></screen>
+
+    <variablelist os="f">
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>RAISE_SETFCAP=no</parameter></term>
+        <listitem>
+          <para>This prevents <command>setcap</command> from being run on
+          itself, which will fail if the kernel or file system does not
+          support extended capabilities.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+  <sect2 id="contents-libcap" role="content">
+    <title>Contents of Libcap</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+
+      <seglistitem>
+        <seg>capsh, getcap, getpcaps, setcap</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="getcap">
+        <term><command>getcap</command></term>
+        <listitem>
+          <para>Examines file capabilities</para>
+          <indexterm zone="ch-system-libcap getcap">
+            <primary sortas="b-getcap">getcap</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="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="libcap">
+        <term><filename class="libraryfile">libcap</filename></term>
+        <listitem>
+          <para>Library for setting and clearing POSIX.1e capabilities</para>
+          <indexterm zone="ch-system-libcap libcap">
+            <primary sortas="c-libcap">libcap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/mips-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -30,4 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -30,4 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/mips64-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -46,4 +46,13 @@
   <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"/>
+  <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="multilib/acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-n32.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.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/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/pkg-config-lite.xml"/>
Index: BOOK/final-system/multilib/acl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/acl-64bit.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/acl-64bit.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,93 @@
+<?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-64bit.html"?>
+
+  <title>Acl-&acl-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-acl">
+    <primary sortas="a-Acl">Acl</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Acl</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><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/acl.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='j'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='k'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='l'])"/>
+
+    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib64
+    </filename> and remove the shared link from <filename class="directory">
+    /lib64</filename>:</para>
+
+<screen os="n"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libacl.so) /usr/lib64/libacl.so
+rm -v /lib64/libacl.so</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='o'])"/>
+
+<screen os="p"><userinput>chmod 755 -v /lib64/libacl.so.1.1.0</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(id('contents-acl'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/acl-n32.xml
===================================================================
--- BOOK/final-system/multilib/acl-n32.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/acl-n32.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,98 @@
+<?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-n32" role="wrap">
+  <?dbhtml filename="acl-n32.html"?>
+
+  <title>Acl-&acl-version; N32 Libraries</title>
+
+  <indexterm zone="ch-system-acl-n32">
+    <primary sortas="a-Acl">Acl</primary>
+    <secondary>N32</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Acl</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><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/acl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib32
+    </filename> and remove the shared link from <filename class="directory">
+    /lib32</filename>:</para>
+
+<screen os="n"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libacl.so) /usr/lib32/libacl.so
+rm -v /lib32/libacl.so</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/acl.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+<screen os="p"><userinput>chmod 755 -v /lib32/libacl.so.1.1.0</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-acl" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/acl.xml
===================================================================
--- BOOK/final-system/multilib/acl.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/acl.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,100 @@
+<?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-32" role="wrap">
+  <?dbhtml filename="acl.html"?>
+
+  <title>Acl-&acl-version; 32 Bit Libraries</title>
+
+  <indexterm zone="ch-system-acl-32">
+    <primary sortas="a-Acl">Acl</primary>
+    <secondary>32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Acl</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><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/acl.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='j'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='k'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='l'])"/>
+
+    <para os="m">Recreate the symlink in <filename class="directory">/usr/lib
+    </filename> and remove the shared link from <filename class="directory">
+    /lib</filename>:</para>
+
+<screen os="n"><userinput>ln -sfv ../../lib/$(readlink /lib/libacl.so) /usr/lib/libacl.so
+rm -v /lib/libacl.so</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='o'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/acl.xml"
+  xpointer="xpointer(//*[@os='p'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-acl" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/multilib/attr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/attr-64bit.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/attr-64bit.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,93 @@
+<?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-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='s1'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><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='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'])"/>
+
+    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib64
+    </filename> and remove the shared link from <filename class="directory">
+    /lib64</filename>:</para>
+
+<screen os="l"><userinput>ln -sfv ../../lib64/$(readlink /lib64/libattr.so) /usr/lib64/libattr.so
+rm -v /lib64/libattr.so</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='m'])"/>
+
+<screen os="n"><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 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/attr-n32.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,98 @@
+<?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 filename="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='s1'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><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='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'])"/>
+
+    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib32
+    </filename> and remove the shared link from <filename class="directory">
+    /lib32</filename>:</para>
+
+<screen os="l"><userinput>ln -sfv ../../lib32/$(readlink /lib32/libattr.so) /usr/lib32/libattr.so
+rm -v /lib32/libattr.so</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='m'])"/>
+
+<screen os="n"><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 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/attr.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -0,0 +1,100 @@
+<?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 filename="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='s1'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='s2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><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='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'])"/>
+
+    <para os="k">Recreate the symlink in <filename class="directory">/usr/lib
+    </filename> and remove the shared link from <filename class="directory">
+    /lib</filename>:</para>
+
+<screen os="l"><userinput>ln -sfv ../../lib/$(readlink /lib/libattr.so) /usr/lib/libattr.so
+rm -v /lib/libattr.so</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='m'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../common/attr.xml"
+  xpointer="xpointer(//*[@os='n'])"/>
+
+  </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/libcap-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libcap-64bit.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/libcap-64bit.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -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 filename="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;
+ln -sfv ../../lib64/$(readlink /lib64/libcap.so) /usr/lib64/libcap.so
+rm -v /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 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/libcap-n32.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -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 filename="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;
+ln -sfv ../../lib32/$(readlink /lib32/libcap.so) /usr/lib32/libcap.so
+rm -v /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 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
+++ BOOK/final-system/multilib/libcap.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -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-libcap-32" role="wrap">
+  <?dbhtml filename="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'])"/>
+
+<screen os="e"><userinput>make RAISE_SETFCAP=no lib=lib install
+chmod -v 755 /lib/libcap.so.&libcap-version;
+ln -sfv ../../lib/$(readlink /lib/libcap.so) /usr/lib/libcap.so
+rm -v /lib/libcap.so
+mv -v /lib/libcap.a /usr/lib</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libcap.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </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/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/ppc-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -30,4 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
Index: BOOK/final-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-64-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/ppc64-64-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -30,4 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/ppc64-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -39,4 +39,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.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="multilib/acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.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/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/sparc-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -30,4 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -30,4 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -39,4 +39,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.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="multilib/acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.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/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/x86-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -30,4 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -30,4 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/final-system/x86_64-chapter.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -39,4 +39,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/multiarch_wrapper.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="multilib/acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/acl-64bit.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/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/introduction/common/changelog.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -37,4 +37,13 @@
 -->
     <listitem>
+      <para>03 July 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added attr, acl, and libcap.</para> 
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>02 July 2017</para>
       <itemizedlist>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/materials/common/packages.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -14,4 +14,22 @@
 
   <variablelist role="materials">
+
+    <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>
@@ -349,4 +367,13 @@
 
     <varlistentry>
+      <term>Libcap (&libcap-version;) - <token>&libcap-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&libcap-home;"/></para>
+        <para>Download: <ulink url="&libcap-url;"/></para>
+        <para>MD5 sum: <literal>&libcap-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Libee (&libee-version;) - <token>&libee-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/packages.ent	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -5,4 +5,16 @@
 
 <!-- Note: For empty *-home entities use " " not "" -->
+
+<!ENTITY acl-version "2.2.52">
+<!ENTITY acl-size "384 KB">
+<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.src.tar.gz">
+<!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
+<!ENTITY acl-home "http://savannah.nongnu.org/projects/acl">
+
+<!ENTITY attr-version "2.4.47">
+<!ENTITY attr-size "340 KB">
+<!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.src.tar.gz">
+<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
+<!ENTITY attr-home "http://savannah.nongnu.org/projects/attr">
 
 <!ENTITY arcload-version "0.5">
@@ -275,4 +287,10 @@
 <!ENTITY less-md5 "81e260e8b12f253c31565acad6ee0e59">
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less">
+
+<!ENTITY libcap-version "2.25">
+<!ENTITY libcap-size "64 KB">
+<!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
+<!ENTITY libcap-md5 "6666b839e5d46c2ad33fc8aa2ceb5f77">
+<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
 
 <!ENTITY libee-version "0.4.1">
Index: BOOK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/temp-system/common/gettext.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -61,9 +61,9 @@
 <screen os="h"><userinput>make -C gnulib-lib
 make -C intl pluralx.c
-make -C src msgfmt</userinput></screen>
+make -C src msgfmt msgmerge xgettext</userinput></screen>
 
     <para os="i">Install the <command>msgfmt</command> binary:</para>
 
-<screen os="j"><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
+<screen os="j"><userinput>cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/common/util-linux.xml
===================================================================
--- BOOK/temp-system/common/util-linux.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/temp-system/common/util-linux.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -27,5 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure \
+<screen os="b"><userinput>NCURSESW6_CONFIG=" " \
+NCURSES6_CONFIG=" " \
+NCURSESW5_CONFIG=" " \
+NCURSES5_CONFIG=" " \
+    ./configure \
     --prefix=/tools \
     --build=${CLFS_HOST} \
@@ -73,9 +77,4 @@
     </variablelist>
 
-    <para os='s1'>Adjust the Makefile</para>
-
-<screen os="s2"><userinput>sed -i 's/-lncursesw -ltinfo/-lncurses/' Makefile
-sed -i 's/LIBNCURSESW/LIBNCURSES/' config.h</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/util-linux.xml"
Index: BOOK/temp-system/multilib/util-linux.xml
===================================================================
--- BOOK/temp-system/multilib/util-linux.xml	(revision 5a62359362bdd2d04ca8aee87b8871d9adaf5946)
+++ BOOK/temp-system/multilib/util-linux.xml	(revision 52b1b258f9e3b4c771660ee781dec5d60d0994fb)
@@ -27,5 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>PKG_CONFIG_PATH="" ./configure \
+<screen os="be"><userinput>NCURSESW6_CONFIG=" " \
+NCURSES6_CONFIG=" " \
+NCURSESW5_CONFIG=" " \
+NCURSES5_CONFIG=" " \
+    ./configure \
     --prefix=/tools \
     --build=${CLFS_HOST} \
@@ -36,12 +40,4 @@
     --disable-nologin \
     --without-python</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
