Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision f37a0012af88fcc9b77fa9172dd5419bb2f02ec3)
+++ BOOK/final-system/alpha-chapter.xml	(revision 2a5046afd842ee0bd145a0fca0eeb74af166317f)
@@ -24,4 +24,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
@@ -29,5 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
@@ -62,5 +63,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/arm-chapter.xml
===================================================================
--- BOOK/final-system/arm-chapter.xml	(revision f37a0012af88fcc9b77fa9172dd5419bb2f02ec3)
+++ BOOK/final-system/arm-chapter.xml	(revision 2a5046afd842ee0bd145a0fca0eeb74af166317f)
@@ -24,4 +24,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
@@ -29,5 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
@@ -62,5 +63,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision f37a0012af88fcc9b77fa9172dd5419bb2f02ec3)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision 2a5046afd842ee0bd145a0fca0eeb74af166317f)
@@ -39,7 +39,8 @@
     <para os="c">Prepare E2fsprogs for compilation:</para>
 
-<screen os="d"><userinput>../configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="d"><userinput>PKG_CONFIG=true ../configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs</userinput></screen>
+    --enable-elf-shlibs --disable-libblkid \
+    --disable-libuuid --disable-fsck --disable-uuidd</userinput></screen>
 
     <variablelist os="e">
@@ -96,11 +97,9 @@
     <para os="l">Remove absolute paths from the link destinations:</para>
 
-<screen os="m"><userinput>rm -v ${CLFS}/usr/lib/lib{blkid,com_err,e2p,ext2fs,ss,uuid}.so
-ln -sv ../../lib/libblkid.so.1 ${CLFS}/usr/lib/libblkid.so
+<screen os="m"><userinput>rm -v ${CLFS}/usr/lib/lib{com_err,e2p,ext2fs,ss}.so
 ln -sv ../../lib/libcom_err.so.2 ${CLFS}/usr/lib/libcom_err.so
 ln -sv ../../lib/libe2p.so.2 ${CLFS}/usr/lib/libe2p.so
 ln -sv ../../lib/libext2fs.so.2 ${CLFS}/usr/lib/libext2fs.so
-ln -sv ../../lib/libss.so.2 ${CLFS}/usr/lib/libss.so
-ln -sv ../../lib/libuuid.so.1 ${CLFS}/usr/lib/libuuid.so</userinput></screen>
+ln -sv ../../lib/libss.so.2 ${CLFS}/usr/lib/libss.so</userinput></screen>
 
   </sect2>
@@ -118,6 +117,6 @@
         logsave, lsattr, mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3,
         mklost+found, resize2fs, tune2fs, and uuidgen.</seg>
-        <seg>libblkid.[a,so], libcom_err.[a,so], libe2p.[a,so],
-        libext2fs.[a,so], libss.[a,so], and libuuid.[a,so]</seg>
+        <seg>libcom_err.[a,so], libe2p.[a,so],
+        libext2fs.[a,so], and libss.[a,so]</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/util-linux-ng.xml
===================================================================
--- BOOK/final-system/common/util-linux-ng.xml	(revision f37a0012af88fcc9b77fa9172dd5419bb2f02ec3)
+++ BOOK/final-system/common/util-linux-ng.xml	(revision 2a5046afd842ee0bd145a0fca0eeb74af166317f)
@@ -109,4 +109,5 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
@@ -119,4 +120,5 @@
         scriptreplay, setarch, setsid, setterm, sfdisk, swapoff (link to swapon),
         swapon, tailf, taskset, tunelp, ul, umount, whereis, and write</seg>
+        <seg>libblkid.[a,so] and libuuid.[a,so]</seg>
       </seglistitem>
     </segmentedlist>
@@ -783,4 +785,26 @@
       </varlistentry>
 
+      <varlistentry id="libblkid">
+        <term><filename class="libraryfile">libblkid</filename></term>
+        <listitem>
+          <para>Contains routines for device identification and token
+          extraction</para>
+          <indexterm zone="ch-system-util-linux-ng libblkid">
+            <primary sortas="c-libblkid">libblkid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libuuid">
+        <term><filename class="libraryfile">libuuid</filename></term>
+        <listitem>
+          <para>Contains routines for generating unique identifiers for objects
+          that may be accessible beyond the local system</para>
+          <indexterm zone="ch-system-util-linux-ng libuuid">
+            <primary sortas="c-libuuid">libuuid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: BOOK/final-system/hppa-chapter.xml
===================================================================
--- BOOK/final-system/hppa-chapter.xml	(revision f37a0012af88fcc9b77fa9172dd5419bb2f02ec3)
+++ BOOK/final-system/hppa-chapter.xml	(revision 2a5046afd842ee0bd145a0fca0eeb74af166317f)
@@ -24,4 +24,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
@@ -29,5 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
@@ -62,5 +63,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision f37a0012af88fcc9b77fa9172dd5419bb2f02ec3)
+++ BOOK/final-system/x86-chapter.xml	(revision 2a5046afd842ee0bd145a0fca0eeb74af166317f)
@@ -24,4 +24,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
@@ -29,5 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
@@ -62,5 +63,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/xz.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision f37a0012af88fcc9b77fa9172dd5419bb2f02ec3)
+++ BOOK/introduction/common/changelog.xml	(revision 2a5046afd842ee0bd145a0fca0eeb74af166317f)
@@ -38,4 +38,20 @@
 
    <listitem>
+      <para>July 26, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Use Util-Linux-NG for libuuid and libblkid
+          instead of E2fsprogs.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Update Util-Linux-NG to 2.16.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated E2fsprogs to 1.41.8.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 11, 2009</para>
       <itemizedlist>
@@ -53,5 +69,5 @@
         </listitem>
         <listitem>
-          <para>[jciccone] - Updated Bash Branch Update Patch to -5.</para>
+           <para>[jciccone] - Updated Bash Branch Update Patch to -5.</para>
         </listitem>
         <listitem>
