Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ basicnet/mailnews/mutt.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -71,6 +71,6 @@
     <xref linkend="slang"/>,
     <xref linkend="libidn"/>,
-    <!-- <xref linkend="db"/> -->
-    <xref linkend="gdbm"/> or
+    <!-- <xref linkend="db"/>
+    <xref linkend="gdbm"/> or -->
     <ulink url="http://qdbm.sourceforge.net/">QDBM</ulink> or
     <ulink url="http://tokyocabinet.sourceforge.net/index.html">Tokyo Cabinet</ulink>, and
@@ -129,5 +129,5 @@
             --enable-hcache --without-qdbm \
             --without-tokyocabinet \
-            --without-gdbm --with-bdb &amp;&amp;
+            --with-gdbm --with-bdb &amp;&amp;
 make</userinput></screen>
 
@@ -176,5 +176,8 @@
     <application>Tokyo Cabinet</application> as the header cache backend.</para>
 
-    <para><parameter>--without-gdbm</parameter>: This switch disables
+    <!-- <para><parameter>- -without-gdbm</parameter>: This switch disables
+    <application>GDBM</application> as the header cache backend.</para> -->
+
+    <para><parameter>--with-gdbm</parameter>: This switch enables
     <application>GDBM</application> as the header cache backend.</para>
 
Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ basicnet/netprogs/cvs.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -69,5 +69,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gdbm"/>,
+    <para role="optional"><!-- <xref linkend="gdbm"/>, -->
     <xref linkend="tcsh"/>,
     <xref linkend="openssh"/>,
Index: general.ent
===================================================================
--- general.ent	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ general.ent	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "17">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2009">
@@ -40,4 +40,5 @@
 <!ENTITY lfs-gcc-version              "4.3.2">
 <!ENTITY lfs-bdb-version              "4.7.25">
+<!ENTITY lfs-gdbm-version             "1.8.3">
 <!ENTITY lfs-coreutils-version        "6.12">
 <!ENTITY lfs-perl-version             "5.10.0">
@@ -108,6 +109,4 @@
 <!ENTITY libxslt-version              "1.1.24">
 <!ENTITY libgtkhtml-version           "2.11.1">
-<!-- <!ENTITY gmp-version                  "4.2.2"> Now in LFS  -->
-<!ENTITY gdbm-version                 "1.8.3">
 <!ENTITY GLib-version                 "1.2.10">
 <!ENTITY glib2-version                "2.18.4">
@@ -142,6 +141,8 @@
 <!-- Obsolete
 <!ENTITY fam-version                  "2.7.0">
+<!ENTITY gdbm-version                 "1.8.3">
 <!ENTITY ispell-version               "3.2.06.epa7">
 <!ENTITY libxml-version               "1.8.17">
+<!ENTITY gmp-version                  "4.2.2">
 -->
 
@@ -157,5 +158,4 @@
 <!ENTITY libart_lgpl-version          "2.3.20">
 <!ENTITY librsvg-version              "2.16.1">
-<!-- <!ENTITY imlib-version                "1.9.15"> -->
 <!ENTITY aalib-version                "1.4rc5">
 <!ENTITY imlib2-version               "1.4.2">
@@ -168,4 +168,5 @@
 <!-- Obsolete
 <!ENTITY libungif-version             "4.1.3">
+<!ENTITY imlib-version                "1.9.15">
 -->
 
@@ -351,5 +352,4 @@
 <!ENTITY inetutils-version            "1.5">
 <!ENTITY ncftp-version                "3.2.1">
-<!-- <!ENTITY ncpfs-version                "2.2.4"> -->
 <!ENTITY net-tools-version            "1.60">
 <!ENTITY wireless-tools-version       "28">
@@ -363,4 +363,8 @@
 <!ENTITY wget-version                 "1.11.4">
 
+<!-- Obsolete
+<!ENTITY ncpfs-version                "2.2.4">
+-->
+
 <!-- Chapter 19 -->
 <!ENTITY traceroute-version           "2.0.12">
@@ -405,4 +409,7 @@
 <!ENTITY mysql-version                "5.1.30">
 <!ENTITY postgresql-version           "8.2.4">
+
+<!-- Obsolete
+-->
 
 <!-- Chapter 24 -->
@@ -461,5 +468,8 @@
 <!ENTITY fluxbox-version              "0.9.15.1">
 <!ENTITY metacity-version             "2.18.5">
-<!-- <!ENTITY xfce-version                 "4.4.2"> -->
+
+<!-- Unmaintained
+<!ENTITY xfce-version                 "4.4.2">
+-->
 
 <!-- Part VIII -->
@@ -611,5 +621,8 @@
 <!ENTITY firefox-version              "3.0.7">
 <!ENTITY galeon-version               "2.0.1">
-<!-- <!ENTITY dillo-version                "0.8.5"> removed -->
+
+<!-- Obsolete
+<!ENTITY dillo-version                "0.8.5">
+-->
 
 <!-- Chapter 37 -->
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ general/genlib/genlib.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -51,6 +51,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libxslt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libgtkhtml.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdbm.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gdbm.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glib2.xml"/>
Index: general/prog/librep.xml
===================================================================
--- general/prog/librep.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ general/prog/librep.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -70,6 +70,6 @@
     <bridgehead renderas="sect3">Librep Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gdbm"/></para>
+    <!-- <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gdbm"/></para> -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ general/prog/php.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -117,6 +117,6 @@
     <bridgehead renderas="sect4">Optional Data Management Utilities and Libraries</bridgehead>
     <para role="optional"><xref linkend="openldap"/>,
-    <xref linkend="gdbm"/>,
-    <!-- <xref linkend="db"/>, -->
+    <!-- <xref linkend="gdbm"/>,
+    <xref linkend="db"/>, -->
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
Index: general/prog/python.xml
===================================================================
--- general/prog/python.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ general/prog/python.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -96,8 +96,8 @@
     (to create package-specific support modules)</bridgehead>
     <para role="optional"><xref linkend="openssl"/>,
-    <xref linkend="tk"/>,
-    <xref linkend="gdbm"/>, and
+    <xref linkend="tk"/>, and
+    <!-- <xref linkend="db"/>
+    <xref linkend="gdbm"/>, and -->
     <ulink url="http://sqlite.org/">SQLite 3</ulink></para>
-    <!-- <xref linkend="db"/> -->
 
     <para condition="html" role="usernotes">User Notes:
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ general/prog/ruby.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -61,8 +61,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/>,
-    <xref linkend="tk"/>, and
-    <!-- <xref linkend="db"/>, -->
-    <xref linkend="gdbm"/></para>
+    <para role="optional"><xref linkend="openssl"/> and
+    <xref linkend="tk"/>
+    <!-- <xref linkend="db"/>,
+    <xref linkend="gdbm"/> --></para>
 
     <para condition="html" role="usernotes">User Notes:
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ gnome/core/libgtop.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -62,6 +62,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gdbm"/>,
-    <xref linkend="gtk-doc"/>, and
+    <para role="optional"><!-- <xref linkend="gdbm"/>, -->
+    <xref linkend="gtk-doc"/> and
     <xref linkend="x-window-system"/></para>
 
@@ -80,7 +80,9 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --infodir=$(pkg-config \
-                --variable=prefix ORBit-2.0)/share/info &amp;&amp;
+<screen><userinput>
+./configure --prefix=$(pkg-config \
+            --variable=prefix ORBit-2.0) \
+            --infodir=$(pkg-config --variable=prefix ORBit-2.0)/share/info \
+            --with-libgtop-inodedb &amp;&amp;
 make</userinput></screen>
 
@@ -122,8 +124,11 @@
     programs.</para>
 
-    <para><option>--with-libgtop-inodedb</option>: Add this parameter to the
+    <!-- <para><option>- -with-libgtop-inodedb</option>: Add this parameter to the
     <command>configure</command> script if you have
     <application>GDBM</application> installed and wish to build the inodedb
-    programs.</para>
+    programs.</para> -->
+
+    <para><option>--with-libgtop-inodedb</option>: This parameter ensures the
+     inodedb programs is built and installed.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ introduction/welcome/changelog.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>July 17th, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Commented out all unnecessary references to GDBM
+          as that package is now built in LFS.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 16th, 2009</para>
       <itemizedlist>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ introduction/welcome/credits.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -251,5 +251,5 @@
         <para>AbiWord, at-spi, ATK, audiofile, avifile, bc, <!--bonobo-activation,-->
         bug-buddy, cdrdao, cdrtools, cpio, curl, dhcp, eog, esound,
-        fcron, fluxbox, gail, galeon, gconf-editor, gdbm, gedit, gimp, GLib2,
+        fcron, fluxbox, gail, galeon, gconf-editor, <!-- gdbm, --> gedit, gimp, GLib2,
         gmp, gnet, gnome-applets, gnome-desktop, gnome-games, gnome-icon-theme,
         gnome-libs, gnome-media, gnome-mime-data, gnome-panel, gnome-session,
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ postlfs/security/cyrus-sasl.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -72,7 +72,7 @@
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
-    <!-- <xref linkend="db"/>, -->
+    <!-- <xref linkend="db"/>,
     <xref linkend="gdbm"/>,
-    <!-- <xref linkend="courier"/>,  -->
+    <xref linkend="courier"/>,  -->
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
     <ulink url="http://sqlite.org/">SQLite</ulink>, and
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ postlfs/security/heimdal.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -80,9 +80,9 @@
     <bridgehead renderas="sect3">Heimdal Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required to Build the Server-Side Tools</bridgehead>
+    <!-- <bridgehead renderas="sect4">Required to Build the Server-Side Tools</bridgehead>
     <para role="required">
-    <!-- <xref linkend="db"/> -->
+    <xref linkend="db"/>
     <xref linkend="db"/> is recommended (installed in LFS)
-    or <xref linkend="gdbm"/></para>
+    or <xref linkend="gdbm"/></para> -->
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ server/mail/courier.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -73,6 +73,6 @@
     <bridgehead renderas="sect3">Courier Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gdbm"/></para>
+    <!-- <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gdbm"/></para> -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ server/mail/exim.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -81,7 +81,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="db"/> (built in LFS) or
-    <!-- <xref linkend="db"/> -->
-    <xref linkend="gdbm"/> or
+    <para role="required"><xref linkend="db"/> or
+    <!-- <xref linkend="db"/>
+    <xref linkend="gdbm"/> -->
+    GDBM (both built in LFS) or
     <ulink url="http://sourceforge.net/projects/tdb">TDB</ulink></para>
 
Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ server/mail/qpopper.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -76,5 +76,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="openssl"/>,
-    <xref linkend="gdbm"/>,
+    <!-- <xref linkend="gdbm"/>, -->
     <xref linkend="linux-pam"/>, and
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/></para>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ server/major/apache.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -80,5 +80,5 @@
     <para role="optional"><xref linkend="pkgconfig"/>,
     <xref linkend="expat"/>,
-    <xref linkend="gdbm"/>,
+    <!-- <xref linkend="gdbm"/>, -->
     <xref linkend="postgresql"/>, and
     <ulink url="http://sqlite.org/">SQLite</ulink></para>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 29919079f9720107ff4790b3e7057d99538f12c6)
+++ server/other/openldap.xml	(revision 7bff1b297bc42e25cc1d6f965774e17b3946b62a)
@@ -64,8 +64,8 @@
     <bridgehead renderas="sect3">OpenLDAP Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
+    <!-- <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="db"/> is recommended (built in LFS) or
-    <!-- <xref linkend="db"/> -->
-    <xref linkend="gdbm"/></para>
+    <xref linkend="db"/>
+    <xref linkend="gdbm"/></para> -->
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
