diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 13cd375a2..4145ee11b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2010-05-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add installed directories information to
+          each package.  Thanks to Chris Staub for the patch. Fixes
+          <ulink url="&lfs-ticket-root;2657">#2655</ulink></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2010-05-21</para>
       <itemizedlist>
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 89037b1fc..97fc0daa6 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -68,10 +68,12 @@
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
         and ifnames</seg>
+        <seg>/usr/share/autoconf</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 4d50b9637..49641233e 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -67,12 +67,15 @@
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>acinstall, aclocal, aclocal-&automake-version;, automake,
         automake-&automake-version;, compile, config.guess, config.sub,
         depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
         py-compile, symlink-tree, and ylwrap</seg>
+        <seg>/usr/share/aclocal-1.11, /usr/share/automake-1.11,
+        /usr/share/doc/automake-&automake-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 95b57e500..67a77d8b6 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -110,9 +110,11 @@
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>bash, bashbug, and sh (link to bash)</seg>
+        <seg>/usr/share/doc/bash-&bash-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 19e693415..9f11bacee 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -128,11 +128,13 @@ cd ../binutils-build</userinput></screen>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump,
         ranlib, readelf, size, strings, and strip</seg>
         <seg>libiberty.a, libbfd.{a,so}, and libopcodes.{a,so}</seg>
+        <seg>/usr/lib/ldscripts</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 238d4174f..35b9ff7e4 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -76,10 +76,12 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed library</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>bison and yacc</seg>
         <seg>liby.a</seg>
+        <seg>/usr/share/bison</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 1abaaa9e4..c1702c36a 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -101,12 +101,14 @@ ln -sv bzip2 /bin/bzcat</userinput></screen>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp (link to
         bzdiff), bzdiff, bzegrep (link to bzgrep), bzfgrep (link to bzgrep),
         bzgrep, bzip2, bzip2recover, bzless (link to bzmore), and bzmore</seg>
         <seg>libbz2.{a,so}</seg>
+        <seg>/usr/share/doc/bzip2-&bzip2-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 1e758d0fd..7f6f09a94 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -140,6 +140,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>base64, basename, cat, chcon, chgrp, chmod, chown, chroot, cksum,
@@ -152,6 +153,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
         split, stat, stdbuf, stty, sum, sync, tac, tail, tee, test, timeout,
         touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq, unlink,
         users, vdir, wc, who, whoami, and yes</seg>
+        <seg>/usr/lib/coreutils</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 4c851a02f..4d030aecc 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -148,6 +148,7 @@ install-info --dir-file=/usr/share/info/dir \
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2freefrag,
@@ -157,6 +158,8 @@ install-info --dir-file=/usr/share/info/dir \
         resize2fs, and tune2fs</seg>
         <seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so} and
         libss.{a,so}</seg>
+        <seg>/usr/include/e2p, /usr/include/et, /usr/include/ext2fs,
+        /usr/include/ss, /usr/share/et, /usr/share/ss</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index e90b5eeae..d7d02cced 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -90,9 +90,11 @@ sed -i 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>bigram, code, find, frcode, locate, oldfind, updatedb, and xargs</seg>
+        <seg>/usr/lib/findutils</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 04ee8ae5b..1679cc31b 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -69,10 +69,12 @@ cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} \
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk, pgawk,
         pgawk-&gawk-version;, and pwcat</seg>
+        <seg>/usr/lib/awk, /usr/share/awk</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 4e8f51574..a5b18e52c 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -276,12 +276,14 @@ SEARCH_DIR("/usr/lib");</computeroutput></screen>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>c++, cc (link to gcc), cpp, g++, gcc, gccbug, and gcov</seg>
         <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a, libgomp.{a,so},
         libmudflap.{a,so}, libmudflapth.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so} and libsupc++.a</seg>
+        <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index d95dfa90c..e4dd351c6 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -73,6 +73,7 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>autopoint, config.charset, config.rpath, envsubst, gettext, gettext.sh,
@@ -81,6 +82,8 @@
         ngettext, recode-sr-latin, and xgettext</seg>
         <seg>libasprintf.{a,so}, libgettextlib.so, libgettextpo.{a,so},
         libgettextsrc.so, and preloadable_libintl.so</seg>
+        <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
+        /usr/share/gettext</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 31a95168c..e799d8f57 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -369,6 +369,7 @@ EOF</userinput></screen>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
@@ -383,6 +384,14 @@ EOF</userinput></screen>
         libnss_nisplus.so, libpcprofile.so, libpthread.{a,so},
         libpthread_nonshared.a, libresolv.{a,so}, librpcsvc.a, librt.{a,so},
         libthread_db.so, and libutil.{a,so}</seg>
+        <seg>/usr/include/arpa, /usr/include/bits, /usr/include/gnu,
+        /usr/include/net, /usr/include/netash, /usr/include/netatalk,
+        /usr/include/netax25, /usr/include/neteconet, /usr/include/netinet,
+        /usr/include/netipx, /usr/include/netiucv, /usr/include/netpacket,
+        /usr/include/netrom, /usr/include/netrose, /usr/include/nfs,
+        /usr/include/protocols, /usr/include/rpc, /usr/include/rpcsvc,
+        /usr/include/sys, /usr/lib/gconv, /usr/lib/glibc, /usr/lib/locale,
+        /usr/share/i18n, /usr/share/zoneinfo</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml
index cae732a60..522cd6710 100644
--- a/chapter06/gmp.xml
+++ b/chapter06/gmp.xml
@@ -108,9 +108,11 @@ cp    -v doc/{isa_abi_headache,configuration} doc/*.html \
 
     <segmentedlist>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>libgmp.{a,so}, libgmpxx.{a,so}, and libmp.{a,so}</seg>
+        <seg>/usr/share/doc/gmp-&gmp-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index b07632dd8..8965c5dd2 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -86,6 +86,7 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>addftinfo, afmtodit, chem, eqn, eqn2graph, gdiffmk,
@@ -95,6 +96,8 @@ ln -sv tbl /usr/bin/gtbl</userinput></screen>
         pic2graph, post-grohtml, preconv, pre-grohtml, refer, roff2dvi,
         roff2html, roff2pdf, roff2ps, roff2text, roff2x, soelim, tbl, tfmtodit,
         and troff</seg>
+        <seg>/usr/lib/groff, /usr/share/doc/groff-&groff-version;,
+        /usr/share/groff</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 807abc8e3..f306491bd 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -78,7 +78,7 @@
         grub-mkrescue, grub-dumpbios, grub-install, grub-mkconfig, 
         grub-mkdevicemap,  grub-probe, grub-setup</seg>
 
-        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, /usr/include/grub</seg>
+        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 12719676b..2647a6e1f 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -90,11 +90,14 @@
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
         nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
+        <seg>/etc/iproute2, /lib/tc, /usr/share/doc/iproute2-&iproute2-version;,
+        /usr/lib/tc</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 3b5360f46..11dc5ab16 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -106,6 +106,7 @@ cp -R -v doc/* \
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbd_mode,
@@ -114,6 +115,7 @@ cp -R -v doc/* \
         psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons,
         setfont, setkeycodes, setleds, setmetamode,
         showconsolefont, showkey, unicode_start, and unicode_stop</seg>
+        <seg>/lib/kbd</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 3679a81aa..2bbe70945 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -67,10 +67,12 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>libtool and libtoolize</seg>
         <seg>libltdl.{a,so}</seg>
+        <seg>/usr/include/libltdl, /usr/share/libtool</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml
index 82fca175f..d52f936ea 100644
--- a/chapter06/linux-headers.xml
+++ b/chapter06/linux-headers.xml
@@ -70,12 +70,16 @@ cp -rv dest/include/* /usr/include</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed headers</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>/usr/include/asm/*.h, /usr/include/asm-generic/*.h,
         /usr/include/drm/*.h, /usr/include/linux/*.h, /usr/include/mtd/*.h,
         /usr/include/rdma/*.h, /usr/include/scsi/*.h, /usr/include/sound/*.h,
         /usr/include/video/*.h, /usr/include/xen/*.h</seg>
+        <seg>/usr/include/asm, /usr/include/asm-generic, /usr/include/drm,
+        /usr/include/linux, /usr/include/mtd, /usr/include/rdma,
+        /usr/include/scsi, /usr/include/sound, /usr/include/video, /usr/include/xen</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 27f187593..96e4603f8 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -271,10 +271,12 @@
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>accessdb, apropos (link to whatis), catman, lexgrog, man, mandb,
         manpath, whatis, and zsoelim</seg>
+        <seg>/usr/lib/man-db, /usr/share/doc/man-db</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 044c4c1e1..b911d70c3 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -76,9 +76,11 @@ make install-html</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>libmpfr.{a,so}</seg>
+        <seg>/usr/share/doc/mpfr-&mpfr-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 6d09aa622..994c6f120 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -158,6 +158,7 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
@@ -166,6 +167,7 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
         libformw.{a,so}, libmenuw.{a,so}, libncurses++w.a, libncursesw.{a,so},
         libpanelw.{a,so} and their non-wide-character counterparts without "w"
         in the library names.</seg>
+        <seg>/usr/share/tabset, /usr/share/terminfo</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 7487ca6ae..d94357b93 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -119,6 +119,7 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>a2p, c2ph, config_data, corelist, cpan, cpan2dist, cpanp,
@@ -129,6 +130,7 @@
         psed (link to s2p), pstruct (link to c2ph), ptar, ptardiff, s2p,
         shasum, splain, and xsubpp</seg>
         <seg>Several hundred which cannot all be listed here</seg>
+        <seg>/usr/lib/perl5</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index ed9cd121f..a4917b38a 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -108,9 +108,12 @@ install -v -m644 doc/*.{ps,pdf,html,dvi} \
 
     <segmentedlist>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>libhistory.{a,so}, and libreadline.{a,so}</seg>
+        <seg>/usr/include/readline, /usr/share/readline,
+        /usr/share/doc/readline-&readline-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index d95e74858..a9fc5d869 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -83,9 +83,11 @@
 
     <segmentedlist>
       <segtitle>Installed program</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>sed</seg>
+        <seg>/usr/share/doc/sed-&sed-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 9647214a0..f82a65f24 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -206,6 +206,7 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>chage, chfn, chgpasswd, chpasswd, chsh, expiry, faillog, gpasswd,
@@ -213,6 +214,7 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> -->
         lastlog, login, logoutd, newgrp, newusers, nologin, passwd, pwck,
         pwconv, pwunconv, sg (link to newgrp), su, useradd, userdel, usermod,
         vigr (link to vipw), and vipw</seg>
+        <seg>/etc/default</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index a2c615caf..67a9f6b72 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -97,10 +97,12 @@ done</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>info, infokey, install-info, makeinfo, pdftexi2dvi, texi2dvi, texi2pdf, and
         texindex</seg>
+        <seg>/usr/share/texinfo</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 0e5fa85fd..4f2af494a 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -155,14 +155,14 @@ make install</userinput></screen>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
         firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd,
         usb_id, write_cd_rules, and write_net_rules</seg>
         <seg>libudev.{a,so}</seg>
-        <seg>/etc/udev</seg>
+        <seg>/etc/udev, /lib/udev, /lib/firmware</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/util-linux-ng.xml b/chapter06/util-linux-ng.xml
index 9ba39f570..985756f29 100644
--- a/chapter06/util-linux-ng.xml
+++ b/chapter06/util-linux-ng.xml
@@ -104,6 +104,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>addpart, agetty, arch, blkid, blockdev, cal, cfdisk, chkdupexe,
@@ -117,6 +118,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         swapoff (link to swapon), swapon, switch_root, tailf, taskset, tunelp,
         ul, umount, uuidd, uuidgen, wall, whereis, and write</seg>
         <seg>libblkid.{a,so}, libuuid.{a,so}</seg>
+        <seg>/usr/share/getopt, /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index cd3a441ba..84c5f60f1 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -197,11 +197,13 @@ set spell</literal></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>ex (link to vim), rview (link to vim), rvim (link to vim), 
         vi (link to vim), view (link to vim), vim, 
         vimdiff (link to vim), vimtutor, and xxd</seg>
+        <seg>/usr/share/vim</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 8d7cb2104..b4e76ea48 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -52,12 +52,14 @@
 
     <segmentedlist>
       <segtitle>Installed scripts</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>checkfs, cleanfs, console, consolelog, functions, halt, ifdown,
         ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot,
         sendsignals, setclock, static, swap, sysctl, sysklogd, template,
         udev, and udev_retry</seg>
+        <seg>/etc/rc.d, /etc/sysconfig</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 9f4ba9194..d56cac861 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -215,10 +215,12 @@ EOF</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed files</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>config-&linux-version;, lfskernel-&linux-version;, and
         System.map-&linux-version;</seg>
+        <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/general.ent b/general.ent
index cb94129b7..9fb041df9 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100521">
-<!ENTITY releasedate "May 19, 2010">
+<!ENTITY version "SVN-20100523">
+<!ENTITY releasedate "May 23, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->