diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index f91469d8c..02f8022f2 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -74,8 +74,8 @@
       <seglistitem>
         <seg>acinstall, aclocal, aclocal-&am-minor-version;, automake,
         automake-&am-minor-version;, compile, config.guess, config.sub,
-        depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
-        py-compile, symlink-tree, and ylwrap</seg>
+        depcomp, install-sh, mdate-sh, missing, mkinstalldirs,
+        py-compile, and ylwrap</seg>
         <seg>/usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;,
         /usr/share/doc/automake-&automake-version;</seg>
       </seglistitem>
@@ -186,16 +186,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="elisp-comp">
-        <term><command>elisp-comp</command></term>
-        <listitem>
-          <para>Byte-compiles Emacs Lisp code</para>
-          <indexterm zone="ch-system-automake elisp-comp">
-            <primary sortas="b-elisp-comp">elisp-comp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="install-sh">
         <term><command>install-sh</command></term>
         <listitem>
@@ -248,16 +238,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="symlink-tree">
-        <term><command>symlink-tree</command></term>
-        <listitem>
-          <para>A script to create a symlink tree of a directory tree</para>
-          <indexterm zone="ch-system-automake symlink-tree">
-            <primary sortas="b-symlink-tree">symlink-tree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ylwrap">
         <term><command>ylwrap</command></term>
         <listitem>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 22684f04f..9f103f716 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -312,9 +312,10 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
 
       <seglistitem>
         <seg>c++, cc (link to gcc), cpp, g++, gcc,
-        gcc-ar, gcc-nm, gcc-ranlib, gccbug, and gcov</seg>
+        gcc-ar, gcc-nm, gcc-ranlib, and gcov</seg>
 
-        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a, libgomp.{a,so},
+        <seg>libasan.{a,so}, libatomic.{a,so}, libgcc.a, libgcc_eh.a, 
+        libgcc_s.so, libgcov.a, libgomp.{a,so}, libitm.{a,so},
         liblto_plugin.so, libmudflap.{a,so}, libmudflapth.{a,so},
         libquadmath.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so} and libsupc++.a</seg>
@@ -418,16 +419,6 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="gccbug">
-        <term><command>gccbug</command></term>
-        <listitem>
-          <para>A shell script used to help create useful bug reports</para>
-          <indexterm zone="ch-system-gcc gccbug">
-            <primary sortas="b-gccbug">gccbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gcov">
         <term><command>gcov</command></term>
         <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 1eb09582f..6e24dfb7d 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -81,10 +81,9 @@ cd ../glibc-build</userinput></screen>
       <varlistentry>
         <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
         <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib/glibc</filename>.</para>
+          <para>This changes the location of some auxillary files from the
+          default of <filename class="directory">/usr/libexec</filename> to
+          <filename class="directory">/usr/lib/glibc</filename>.</para>
         </listitem>
       </varlistentry>
 
@@ -414,7 +413,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
       <seglistitem>
         <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
         ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd, pcprofiledump,
-        pldd, pt_chown, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
+        pldd, rpcgen, sln, sotruss, sprof, tzselect, xtrace,
         zdump, and zic</seg>
         <seg>ld.so, libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
         libbsd-compat.a, libc.{a,so}, libc_nonshared.a, libcidn.so,
@@ -605,7 +604,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="pt_chown">
         <term><command>pt_chown</command></term>
         <listitem>
@@ -616,7 +615,7 @@ mkdir -pv /etc/ld.so.conf.d</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="rpcgen">
         <term><command>rpcgen</command></term>
         <listitem>
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index 48c1585c3..c1bd05224 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -102,7 +102,7 @@ ln -sv kmod /bin/lsmod</userinput></screen>
       <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
-        <seg>depmod (link to kmod), insmod (link to kmod), kmod, kmod-nolib,
+        <seg>depmod (link to kmod), insmod (link to kmod), kmod, 
         lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod),
         and rmmod (link to kmod)</seg>
         <seg>/lib/kmod.so</seg>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index f132967ed..d4c56f4c6 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -120,7 +120,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make check"</userinput></screen>
         pg, pivot_root, prlimit, raw, readprofile, rename, renice, resizepart,
         rev, rtcwake, script, scriptreplay, setarch, setsid, setterm, sfdisk,
         swaplabel, swapoff (link to swapon), swapon, switch_root, tailf,
-        taskset, tunelp, ul, umount, unshare, utmpdump, uuidd, uuidgen, wall,
+        taskset, ul, umount, unshare, utmpdump, uuidd, uuidgen, wall,
         wdctl, whereis, wipefs, and x86_64</seg>
 
         <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
@@ -963,16 +963,6 @@ su nobody -s /bin/bash -c "PATH=$PATH make check"</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="tunelp">
-        <term><command>tunelp</command></term>
-        <listitem>
-          <para>Tunes the parameters of the line printer</para>
-          <indexterm zone="ch-system-util-linux tunelp">
-            <primary sortas="b-tunelp">tunelp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ul">
         <term><command>ul</command></term>
         <listitem>
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 5c7d71cbd..7c2979f99 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -55,8 +55,8 @@
 
       <seglistitem>
         <seg>checkfs, cleanfs, console, functions, halt, ifdown,
-        ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot,
-        sendsignals, setclock, static, swap, sysctl, sysklogd, template,
+        ifup, localnet, modules, mountfs, mountvirtfs, network, rc, reboot,
+        sendsignals, setclock, ipv4-static, swap, sysctl, sysklogd, template,
         udev, and udev_retry</seg>
         <seg>/etc/rc.d, /etc/init.d (symbolic link), /etc/sysconfig,
         /lib/services, /lib/lsb (symbolic link)</seg>
@@ -179,13 +179,13 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="mountkernfs-bootscripts">
-        <term><command>mountkernfs</command></term>
+      <varlistentry id="mountvirtfs-bootscripts">
+        <term><command>mountvirtfs</command></term>
         <listitem>
           <para>Mounts virtual kernel file systems, such as <systemitem
           class="filesystem">proc</systemitem></para>
-          <indexterm zone="ch-scripts-bootscripts mountkernfs-bootscripts">
-            <primary sortas="d-mountkernfs">mountkernfs</primary>
+          <indexterm zone="ch-scripts-bootscripts mountvirtfs-bootscripts">
+            <primary sortas="d-mountvirtfs">mountvirtfs</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -245,13 +245,13 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="static-bootscripts">
-        <term><command>static</command></term>
+      <varlistentry id="ipv4-static-bootscripts">
+        <term><command>ipv4-static</command></term>
         <listitem>
           <para>Provides the functionality needed to assign a static Internet
           Protocol (IP) address to a network interface</para>
-          <indexterm zone="ch-scripts-bootscripts static-bootscripts">
-            <primary sortas="d-static">static</primary>
+          <indexterm zone="ch-scripts-bootscripts ipv4-static-bootscripts">
+            <primary sortas="d-ipv4-static">ipv4-static</primary>
           </indexterm>
         </listitem>
       </varlistentry>