Index: BOOK/final-system/common/automake.xml
===================================================================
--- BOOK/final-system/common/automake.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/automake.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -47,6 +47,6 @@
 
       <seglistitem>
-        <seg>acinstall, aclocal, aclocal-1.9, automake,
-        automake-1.9, compile, config.guess, config.sub,
+        <seg>acinstall, aclocal, aclocal-&automake-version2;, automake,
+        automake-&automake-version2;, compile, config.guess, config.sub,
         depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
         py-compile, symlink-tree, and ylwrap</seg>
@@ -81,5 +81,5 @@
 
       <varlistentry id="aclocal-version">
-        <term><command>aclocal-1.9</command></term>
+        <term><command>aclocal-&automake-version2;</command></term>
         <listitem>
           <para>A hard link to <command>aclocal</command></para>
@@ -109,5 +109,5 @@
 
       <varlistentry id="automake-version">
-        <term><command>automake-1.9</command></term>
+        <term><command>automake-&automake-version2;</command></term>
         <listitem>
           <para>A hard link to <command>automake</command></para>
Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -102,5 +102,5 @@
       <seglistitem>
         <seg>badblocks, blkid, chattr, compile_et, debugfs, dumpe2fs,
-        e2fsck, e2image, e2label, findfs, fsck, fsck.ext2, fsck.ext3,
+        e2fsck, e2image, e2label, filefrag, findfs, fsck, fsck.ext2, fsck.ext3,
         logsave, lsattr, mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3,
         mklost+found, resize2fs, tune2fs, and uuidgen.</seg>
@@ -221,4 +221,14 @@
       </varlistentry>
 
+      <varlistentry id="filefrag">
+        <term><command>filefrag</command></term>
+        <listitem>
+          <para>Reports on how badly fragmented a particular file might be</para>
+          <indexterm zone="ch-system-e2fsprogs filefrag">
+            <primary sortas="b-filefrag">filefrag</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="findfs">
         <term><command>findfs</command></term>
Index: BOOK/final-system/common/gettext.xml
===================================================================
--- BOOK/final-system/common/gettext.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/gettext.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -50,5 +50,5 @@
 
       <seglistitem>
-        <seg>autopoint, config.charset, config.rpath, envsubst, gettext,
+        <seg>autopoint, config.charset, config.rpath, envsubst, gettext, gettext.sh,
         gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen,
         msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq,
@@ -115,4 +115,14 @@
           <indexterm zone="ch-system-gettext gettext">
             <primary sortas="b-gettext">gettext</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gettext.sh">
+        <term><command>gettext.sh</command></term>
+        <listitem>
+          <para>Primarily serves as a shell function library for gettext</para>
+          <indexterm zone="ch-system-gettext gettext.sh">
+            <primary sortas="b-gettext.sh">gettext.sh</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/common/groff.xml
===================================================================
--- BOOK/final-system/common/groff.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/groff.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -59,8 +59,8 @@
 
       <seglistitem>
-        <seg>addftinfo, afmtodit, eqn, eqn2graph, geqn (link to eqn), grn,
-        grodvi, groff, groffer, grog, grolbp, grolj4, grops, grotty, gtbl
-        (link to tbl), hpftodit, indxbib, lkbib, lookbib, mmroff, neqn,
-        nroff, pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, refer,
+        <seg>addftinfo, afmtodit, eqn, eqn2graph, gdiffmk, geqn (link to eqn),
+        grap2graph, grn, grodvi, groff, groffer, grog, grolbp, grolj4, grops,
+        grotty, gtbl (link to tbl), hpftodit, indxbib, lkbib, lookbib, mmroff,
+        neqn, nroff, pdfroff, pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, refer,
         soelim, tbl, tfmtodit, troff, and zsoelim (link to soelim)</seg>
       </seglistitem>
@@ -116,4 +116,14 @@
       </varlistentry>
 
+      <varlistentry id="gdiffmk">
+        <term><command>gdiffmk</command></term>
+        <listitem>
+          <para>Marks differences between groff/nroff/troff files</para>
+          <indexterm zone="ch-system-groff gdiffmk">
+            <primary sortas="b-gdiffmk">gdiffmk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="geqn">
         <term><command>geqn</command></term>
@@ -122,4 +132,14 @@
           <indexterm zone="ch-system-groff geqn">
             <primary sortas="b-geqn">geqn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="grap2graph">
+        <term><command>grap2graph</command></term>
+        <listitem>
+          <para>Converts a grap diagram into a cropped bitmap image</para>
+          <indexterm zone="ch-system-groff grap2graph">
+            <primary sortas="b-grap2graph">grap2graph</primary>
           </indexterm>
         </listitem>
@@ -319,4 +339,14 @@
       </varlistentry>
 
+      <varlistentry id="pdfroff">
+        <term><command>pdfroff</command></term>
+        <listitem>
+          <para>Creates pdf documents using groff</para>
+          <indexterm zone="ch-system-groff pdfroff">
+            <primary sortas="b-pdfroff">pdfroff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="pfbtops">
         <term><command>pfbtops</command></term>
Index: BOOK/final-system/common/module-init-tools.xml
===================================================================
--- BOOK/final-system/common/module-init-tools.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/module-init-tools.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -49,5 +49,18 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="g"><userinput>make DESTDIR=${LFS} INSTALL=install install</userinput></screen>
+
+    <variablelist os="h">
+      <title>The meaning of the make parameter:</title>
+      <varlistentry>
+        <term><parameter>INSTALL=install</parameter></term>
+        <listitem>
+          <para>Normally, make install will not install the binaries if they
+          already exist. This option overrides that behavior by calling
+          <command>install</command> instead of using the default wrapper
+          script.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
   </sect2>
Index: BOOK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/perl.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -86,8 +86,8 @@
 
       <seglistitem>
-        <seg>a2p, c2ph, dprofpp, find2perl, h2ph, h2xs, libnetcfg,
+        <seg>a2p, c2ph, cpan, dprofpp, enc2xs, find2perl, h2ph, h2xs, instmodsh, libnetcfg,
         perl, perl&perl-version; (link to perl), perlbug, perlcc, perldoc,
         perlivp, piconv, pl2pm, pod2html, pod2latex, pod2man, pod2text,
-        pod2usage, podchecker, podselect, psed (link to s2p), pstruct (link
+        pod2usage, podchecker, podselect, prove, psed (link to s2p), pstruct (link
         to c2ph), s2p, splain, and xsubpp</seg>
         <seg>Several hundred which cannot all be listed here</seg>
@@ -121,4 +121,14 @@
       </varlistentry>
 
+      <varlistentry id="cpan">
+        <term><command>cpan</command></term>
+        <listitem>
+          <para>Shell script that provides a command interface to CPAN.pm</para>
+          <indexterm zone="ch-system-perl cpan">
+            <primary sortas="b-cpan">cpan</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="dprofpp">
         <term><command>dprofpp</command></term>
@@ -127,4 +137,15 @@
           <indexterm zone="ch-system-perl dprofpp">
             <primary sortas="b-dprofpp">dprofpp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="enc2xs">
+        <term><command>enc2xs</command></term>
+        <listitem>
+          <para>Builds a Perl extension for the Encode module from either
+          Unicode Character Mappings or Tcl Encoding Files</para>
+          <indexterm zone="ch-system-perl enc2xs">
+            <primary sortas="b-enc2xs">enc2xs</primary>
           </indexterm>
         </listitem>
@@ -175,4 +196,15 @@
       </varlistentry>
 
+      <varlistentry id="instmodsh">
+        <term><command>instmodsh</command></term>
+        <listitem>
+          <para>A shell script for examining installed Perl modules,
+          and can even create a tarball from an installed module</para>
+          <indexterm zone="ch-system-perl instmodsh">
+            <primary sortas="b-instmodsh">instmodsh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="perl">
         <term><command>perl</command></term>
@@ -334,4 +366,14 @@
       </varlistentry>
 
+      <varlistentry id="prove">
+        <term><command>prove</command></term>
+        <listitem>
+          <para>A command-line tool for running tests against Test::Harness</para>
+          <indexterm zone="ch-system-perl prove">
+            <primary sortas="b-prove">prove</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="psed">
         <term><command>psed</command></term>
Index: BOOK/final-system/common/procps.xml
===================================================================
--- BOOK/final-system/common/procps.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/procps.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -52,6 +52,6 @@
 
       <seglistitem>
-        <seg>free, kill, pgrep, pkill, pmap, ps, skill, snice, sysctl, tload,
-        top, uptime, vmstat, w, and watch</seg>
+        <seg>free, kill, pgrep, pkill, pmap, ps, pwdx, skill, slabtop, snice, sysctl,
+        tload, top, uptime, vmstat, w, and watch</seg>
         <seg>libproc.so</seg>
       </seglistitem>
@@ -124,4 +124,14 @@
       </varlistentry>
 
+      <varlistentry id="pwdx">
+        <term><command>pwdx</command></term>
+        <listitem>
+          <para>Reports the current working directory of a process</para>
+          <indexterm zone="ch-system-procps pwdx">
+            <primary sortas="b-pwdx">pwdx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="skill">
         <term><command>skill</command></term>
@@ -130,4 +140,14 @@
           <indexterm zone="ch-system-procps skill">
             <primary sortas="b-skill">skill</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slabtop">
+        <term><command>slabtop</command></term>
+        <listitem>
+          <para>Displays detailed kernel slap cache information in real time</para>
+          <indexterm zone="ch-system-procps slabtop">
+            <primary sortas="b-slabtop">slabtop</primary>
           </indexterm>
         </listitem>
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/shadow.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -41,5 +41,5 @@
     <para os="d">Prepare Shadow for compilation:</para>
 
-<screen os="e"><userinput>./configure --libdir=/lib --enable-shared \
+<screen os="e"><userinput>./configure --libdir=/lib --sysconfdir=/etc --enable-shared \
     --without-libpam --without-audit --without-selinux \
     --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
@@ -59,5 +59,5 @@
       <term><parameter>--without-audit</parameter></term>
       <listitem><para>Support for auditing is enabled by default, but a
-      a library that it needs is not installed in a base LFS system. This
+      library that it needs is not installed in a base LFS system. This
       switch disables auditing support.</para></listitem>
     </varlistentry>
@@ -86,18 +86,4 @@
 <screen os="m"><userinput>make DESTDIR=${LFS} install</userinput></screen>
 
-    <para id="shadow-limits-login_access" os="n">Shadow uses two files to configure
-    authentication settings for the system. Install these two configuration
-    files:</para>
-
-    <indexterm zone="shadow-limits-login_access" os="o">
-      <primary sortas="e-/etc/limits">/etc/limits</primary>
-    </indexterm>
-
-    <indexterm zone="shadow-limits-login_access" os="p">
-      <primary sortas="e-/etc/login.access">/etc/login.access</primary>
-    </indexterm>
-
-<screen os="q"><userinput>cp -v etc/{limits,login.access} ${LFS}/etc</userinput></screen>
-
     <para id="shadow-login_defs" os="r">Instead of using the default
     <emphasis>crypt</emphasis> method, use the more secure
@@ -114,7 +100,8 @@
     </indexterm>
 
-<screen os="t"><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
+<screen os="t"><userinput>cp {LFS}/etc/login.defs login.defs.orig
+sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
     -e 's@/var/spool/mail@/var/mail@' \
-    etc/login.defs &gt; ${LFS}/etc/login.defs</userinput></screen>
+    login.defs.orig &gt; ${LFS}/etc/login.defs</userinput></screen>
 
     <note os="u">
@@ -193,7 +180,7 @@
         <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
         groupadd, groupdel, groupmod, grpck, grpconv, grpunconv, lastlog,
-        login, logoutd, newgrp, newusers, passwd, pwck, pwconv, pwunconv,
-        sg (link to newgrp), useradd, userdel, usermod, vigr (link to vipw),
-        and vipw</seg>
+        login, logoutd, newgrp, newusers, nologin, passwd, pwck, pwconv,
+        pwunconv, sg (link to newgrp), useradd, userdel, usermod,
+        vigr (link to vipw), and vipw</seg>
         <seg>libshadow.[a,so]</seg>
       </seglistitem>
@@ -407,4 +394,16 @@
       </varlistentry>
 
+      <varlistentry id="nologin">
+        <term><command>nologin</command></term>
+        <listitem>
+          <para>Displays a message that an account is not available. Designed
+          to be used as the default shell for accounts that have been
+          disabled</para>
+          <indexterm zone="ch-system-shadow nologin">
+            <primary sortas="b-nologin">nologin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="passwd">
         <term><command>passwd</command></term>
Index: BOOK/final-system/common/sysvinit.xml
===================================================================
--- BOOK/final-system/common/sysvinit.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/sysvinit.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -122,8 +122,8 @@
 
       <seglistitem>
-        <seg>halt, init, killall5, last, lastb (link to last), mesg, mountpoint, pidof
-        (link to killall5), poweroff (link to halt), reboot (link to halt),
-        runlevel, shutdown, sulogin, telinit (link to init), utmpdump,
-        and wall</seg>
+        <seg>bootlogd, halt, init, killall5, last, lastb (link to last), mesg,
+        mountpoint, pidof (link to killall5), poweroff (link to halt),
+        reboot (link to halt), runlevel, shutdown, sulogin,
+        telinit (link to init), utmpdump, and wall</seg>
       </seglistitem>
     </segmentedlist>
@@ -133,4 +133,14 @@
       <?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="halt">
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/final-system/common/util-linux.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -135,10 +135,10 @@
         <seg>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
         colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat,
-        fdisk, fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm,
+        fdisk, flock, fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm,
         ipcs, isosize, line, logger, look, losetup, mcookie, mkfs, mkfs.bfs,
         mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, pg, pivot_root,
         ramsize (link to rdev), raw, rdev, readprofile, rename, renice, rev,
         rootflags (link to rdev), script, setfdprm, setsid, setterm, sfdisk,
-        swapoff (link to swapon), swapon, tunelp, ul, umount, vidmode
+        swapoff (link to swapon), swapon, tailf, tunelp, ul, umount, vidmode
         (link to rdev), whereis, and write</seg>
       </seglistitem>
@@ -323,4 +323,15 @@
           <indexterm zone="ch-system-util-linux fdisk">
             <primary sortas="b-fdisk">fdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="flock">
+        <term><command>flock</command></term>
+        <listitem>
+          <para>Acquires a file lock and then executes a command with the lock
+          held</para>
+          <indexterm zone="ch-system-util-linux flock">
+            <primary sortas="b-flock">flock</primary>
           </indexterm>
         </listitem>
@@ -721,4 +732,16 @@
       </varlistentry>
 
+      <varlistentry id="tailf">
+        <term><command>tailf</command></term>
+        <listitem>
+          <para>Tracks the growth of a log file. Displays the last 10 lines
+          of a log file, then continues displaying any new entries in the
+          log file as they are created</para>
+          <indexterm zone="ch-system-util-linux tailf">
+            <primary sortas="b-tailf">tailf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="tunelp">
         <term><command>tunelp</command></term>
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/general.ent	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20060609">
+<!ENTITY version "SVN-20060611">
 <!ENTITY version-ARM "&version;-ARM">
 
-<!ENTITY releasedate "June 9, 2006">
+<!ENTITY releasedate "June 11, 2006">
 <!ENTITY milestone "0.2">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/introduction/common/changelog.xml	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -36,4 +36,22 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>June 11, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated the list of installed programs for several packages.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Fixed the module-init-tools install in the presence of existing files.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated to Linux-Headers-2.6.16.20-06092006.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated to Shadow-4.0.16.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 8f2279ffabe5bc18b2d962ada7192a080bb73d49)
+++ BOOK/packages.ent	(revision 82b662df945be6145acf57f1b2396a07e74ede26)
@@ -22,4 +22,5 @@
 
 <!ENTITY automake-version "1.9.6">
+<!ENTITY automake-version2 "1.9">
 <!ENTITY automake-size "748 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
@@ -251,5 +252,5 @@
 <!ENTITY linux-home "http://www.kernel.org/">
 
-<!ENTITY linux-headers-version "&linux-version;-06052006">
+<!ENTITY linux-headers-version "&linux-version;-06092006">
 <!ENTITY linux-headers-size "1,480 KB">
 <!ENTITY linux-headers-url "http://ftp.jg555.com/headers/linux-headers-&linux-headers-version;.tar.bz2">
@@ -260,5 +261,5 @@
 <!ENTITY m4-size "300 KB">
 <!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.bz2">
-<!ENTITY m4-md5 "eb93bfbcb12cf00165583302bb31a822">
+<!ENTITY m4-md5 "6ab673550854113c3d0607ddb2a32453">
 <!ENTITY m4-home "&gnu-software;m4/">
 
@@ -347,8 +348,8 @@
 <!ENTITY sed-home "&gnu-software;sed/">
 
-<!ENTITY shadow-version "4.0.15">
-<!ENTITY shadow-size "1,265 KB">
+<!ENTITY shadow-version "4.0.16">
+<!ENTITY shadow-size "1,412 KB">
 <!ENTITY shadow-url "ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2">
-<!ENTITY shadow-md5 "a0452fa989f8ba45023cc5a08136568e">
+<!ENTITY shadow-md5 "1d91f7479143d1d705b94180c0d4874b">
 <!ENTITY shadow-home " ">
 
