Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ basicnet/netprogs/subversion.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -98,5 +98,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="python"/> (required to run the test suite),
-    <!-- <xref linkend="db"/>, -->
+    <xref linkend="db"/>,
     <xref linkend="apache"/> (if you have <application>Apache Portable
     Runtime</application> installed),
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ general/prog/php.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -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 bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ general/prog/python.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -96,7 +96,7 @@
     (to create package-specific support modules)</bridgehead>
     <para role="optional"><xref linkend="openssl"/>,
-    <xref linkend="tk"/>, and
-    <!-- <xref linkend="db"/>
-    <xref linkend="gdbm"/>, and -->
+    <xref linkend="tk"/>,
+    <xref linkend="db"/>, and
+    <!-- <xref linkend="gdbm"/>, and -->
     <ulink url="http://sqlite.org/">SQLite 3</ulink></para>
 
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ general/prog/ruby.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -61,8 +61,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/> and
-    <xref linkend="tk"/>
-    <!-- <xref linkend="db"/>,
-    <xref linkend="gdbm"/> --></para>
+    <para role="optional"><xref linkend="openssl"/>,
+    <xref linkend="tk"/>, and
+    <xref linkend="db"/></para>
+    <!-- <xref linkend="gdbm"/></para> -->
 
     <para condition="html" role="usernotes">User Notes:
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ kde/add/kdeaddons.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -69,5 +69,5 @@
     <xref linkend="kdepim"/>,
     <xref linkend="kdegames"/>,
-    <!-- <xref linkend="db"/>, -->
+    <xref linkend="db"/>,
     <xref linkend="xmms"/>, and
     <xref linkend="sdl"/></para>
Index: kde/devel/kdesdk.xml
===================================================================
--- kde/devel/kdesdk.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ kde/devel/kdesdk.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -66,7 +66,7 @@
        <xref linkend="libjpeg"/>,
        <xref linkend="subversion"/>,
-       <xref linkend="libxml2"/>, and
-       <xref linkend="libxslt"/></para>
-    <!-- <xref linkend="db"/> -->
+       <xref linkend="libxml2"/>,
+       <xref linkend="libxslt"/>, and
+       <xref linkend="db"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ postlfs/security/cyrus-sasl.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -72,6 +72,6 @@
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
-    <!-- <xref linkend="db"/>,
-    <xref linkend="gdbm"/>,
+    <xref linkend="db"/>,
+    <!-- <xref linkend="gdbm"/>,
     <xref linkend="courier"/>,  -->
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ postlfs/security/heimdal.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -80,8 +80,8 @@
     <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"/> is recommended (installed in LFS)
+    <xref linkend="db"/> (recommended) or GDBM (GDBM is installed in LFS)</para>
+    <!-- <xref linkend="db"/> is recommended (installed in LFS)
     or <xref linkend="gdbm"/></para> -->
 
Index: postlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ postlfs/security/linux-pam.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -78,6 +78,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="cracklib"/>,
-    <xref linkend="x-window-system"/>, and
-    <!-- <xref linkend="db"/> (for the pam_userdb module), -->
+    <xref linkend="x-window-system"/>,
+    <xref linkend="db"/> (for the pam_userdb module), and
     <ulink url="http://www.prelude-ids.org/">Prelude</ulink></para>
 
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ server/databases/db.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -30,5 +30,5 @@
     <title>Introduction to Berkeley DB</title>
 
-    <para>The <application>Berkeley DB</application> package contains programs
+    <!-- <para>The <application>Berkeley DB</application> package contains programs
     and utilities used by many other applications for database related
     functions. This package is also installed during LFS and may already exist
@@ -36,5 +36,9 @@
     reinstall it if you need the additional language bindings or the RPC
     server. If you do reinstall <application>Berkeley DB</application>, ensure
-    you use the &lfs-bdb-version; version used in the LFS book.</para>
+    you use the &lfs-bdb-version; version used in the LFS book.</para> -->
+
+    <para>The <application>Berkeley DB</application> package contains programs
+    and utilities used by many other applications for database related
+    functions.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -129,10 +133,10 @@
     <title>Installation of Berkeley DB</title>
 
-    <para>The installation commands below are identical to the commands used
+    <!-- <para>The installation commands below are identical to the commands used
     in the LFS book. If you installed <application>Berkeley DB</application>
     in LFS, and you don't add anything to the <command>configure</command>
     script, you'll end up with exactly what you already have. The additional
     parameters you can use are listed in the Command Explanations section
-    below.</para>
+    below.</para> -->
 
     <note>
@@ -218,17 +222,19 @@
     <title>Contents</title>
 
-    <para>Only the program and libraries not installed in LFS are listed here,
+    <!-- <para>Only the program and libraries not installed in LFS are listed here,
     the others can be found at <ulink
     url="&lfs-root;/chapter06/db.html#contents-db"/> as they were initially
-    installed during the building of LFS.</para>
+    installed during the building of LFS.</para> -->
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>berkeley_db_svc</seg>
-        <seg>libdb_java.{so,a}, libdb_tcl.{so,a} and db.jar</seg>
+        <seg>berkeley_db_svc, db_archive, db_checkpoint, db_deadlock, db_dump,
+        db_load, db_printlog, db_recover, db_stat, db_upgrade, db_verify</seg>
+        <seg>libdb.{so,a}, libdb_cxx.{so,a}, libdb_java.{so,a},
+        libdb_tcl.{so,a} and db.jar</seg>
         <seg>/usr/share/doc/db-&db-version;</seg>
       </seglistitem>
@@ -251,7 +257,4 @@
       </varlistentry>
 
-      <!-- These are left in so that if LFS ever dumps BDB, it is easy to
-           restore this information
-
       <varlistentry id="db_archive">
         <term><command>db_archive</command></term>
@@ -361,6 +364,4 @@
       </varlistentry>
 
-      -->
-
     </variablelist>
 
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ server/mail/exim.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -82,7 +82,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="db"/> or
-    <!-- <xref linkend="db"/>
-    <xref linkend="gdbm"/> -->
-    GDBM (both built in LFS) or
+    <!-- <xref linkend="gdbm"/> -->
+    GDBM (GDBM built in LFS) or
     <ulink url="http://sourceforge.net/projects/tdb">TDB</ulink></para>
 
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ server/mail/postfix.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -60,10 +60,6 @@
     <bridgehead renderas="sect3">Postfix Dependencies</bridgehead>
 
-    <!-- commenting this out as BDB is now built in LFS
-
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="db"/></para>
-
-    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ server/mail/sendmail.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -58,6 +58,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="procmail"/></para>
-    <!-- <xref linkend="db"/> -->
+    <para role="required"><xref linkend="procmail"/> and
+    <xref linkend="db"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ server/major/apache.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -68,5 +68,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="db"/>, -->
+    <para role="optional"><xref linkend="db"/>,
     <xref linkend="openssl"/>,
     <xref linkend="openldap"/>,
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ server/other/openldap.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -64,8 +64,8 @@
     <bridgehead renderas="sect3">OpenLDAP Dependencies</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> -->
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="db"/> (recommended) or
+    GDBM (GDBM is built in LFS)</para>
+    <!-- <xref linkend="gdbm"/></para> -->
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
Index: x/wm/xfce.xml
===================================================================
--- x/wm/xfce.xml	(revision bcb166aaca080c5938408312dc4ee1f1d5e25b51)
+++ x/wm/xfce.xml	(revision de7f20ebc73f45b898079cfc333930aeba32b1b9)
@@ -175,5 +175,5 @@
     <!-- FIXME: what about the internal version? -->
     daylight time saving rules in the USA), and
-    <xref linkend="db"/> (optional, part of LFS).</para>
+    <xref linkend="db"/> (optional)</para>
 
     <bridgehead renderas="sect3" id="xfce4-appfinder"
