Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ basicnet/netlibs/wvstreams.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -76,5 +76,5 @@
     <para role="optional"><xref linkend="pkgconfig"/>,
     <xref linkend="gamin"/>,
-    <xref linkend="db"/>,
+    <!-- <xref linkend="db"/>, -->
     <xref linkend="linux-pam"/>,
     <xref linkend="tcl"/>,
@@ -88,5 +88,5 @@
     <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
     <ulink url="http://xplc.sourceforge.net/">XPLC</ulink>,
-    <ulink url="http://valgrind.kde.org/">Valgrind</ulink> and
+    <ulink url="http://valgrind.kde.org/">Valgrind</ulink>, and
     <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
 
Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ basicnet/netprogs/subversion.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -88,23 +88,28 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxml2"/> (only if using the bundled version of
-    <application>neon</application>)</para>
+    <para role="required"><xref linkend="libxml2"/> (only if using the bundled
+    version of <application>neon</application>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> (required to run the test suite),
-    <xref linkend="db"/>,
+    <para role="optional"><xref linkend="python"/> (required to run the test
+    suite),
+    <!-- <xref linkend="db"/>, -->
     <xref linkend="apache"/>,
     <ulink url="http://www.webdav.org/neon/">neon-&svn-neon-version;</ulink>,
+
     <xref linkend="jdk"/> (to build the <application>Java</application>
     bindings),
+
     <ulink url="http://www.junit.org/">JUnit</ulink> (required for running the
     <application>Java</application> bindings test suite and requires
     <xref linkend="unzip"/>),
+
     <ulink url="http://www.inet.no/dante/">Dante</ulink> (alternate
-    <application>Java</application> compiler),
+    <application>Java</application> compiler), and
+
     <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">
     Jikes</ulink> (another alternate
-    <application>Java</application> compiler) and
-    inetd or <xref linkend="xinetd"/> (server only)</para>
+    <application>Java</application> compiler)</para>
+    <!-- inetd or <xref linkend="xinetd"/> (server only) -->
 
     <bridgehead renderas="sect4">Optional for the Bundled Version of
@@ -122,9 +127,11 @@
     <application>SWIG</application> Bindings</bridgehead>
     <para role="optional"><ulink url="http://www.swig.org">SWIG</ulink>,
-    <xref linkend="python"/> and
+    <xref linkend="python"/>, and
     <xref linkend="ruby"/> (<application>Ruby</application> bindings require
     <application>Swig-1.3.24</application>)</para>
 
-    <!-- Added a note that the bindings may not work correctly -->
+    <!-- Added a note that the bindings may not work correctly. This may have
+         to be commented out in future versions where all the bindings build
+         and work properly-->
     <para>Note that the <application>Python</application> and
     <application>Perl</application> bindings may not compile properly with
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ general/prog/php.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -93,5 +93,5 @@
     <ulink url="http://re2c.org/">re2c</ulink>,
     <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
-    <ulink url="http://www.gnu.org/software/recode/">recode</ulink> and
+    <ulink url="http://www.gnu.org/software/recode/">recode</ulink>, and
     <xref linkend="sendmail"/> (or another
     <ulink url="../server/mail.html">MTA</ulink> that provides a
@@ -108,5 +108,5 @@
     <ulink url="http://www.boutell.com/gd/">GD</ulink>,
     <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
-    t1lib</ulink> and
+    t1lib</ulink>, and
     <ulink url="http://partners.adobe.com/asn/acrobat/forms.jsp">FDF Toolkit</ulink></para>
 
@@ -117,5 +117,5 @@
     <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
     <ulink url="http://www.roxen.com/products/webserver/">Roxen WebServer</ulink>,
-    <ulink url="http://caudium.net/">Caudium</ulink> and
+    <ulink url="http://caudium.net/">Caudium</ulink>, and
     <ulink url="http://www.openwddx.org/">WDDX</ulink></para>
 
@@ -123,5 +123,5 @@
     <para role="optional"><xref linkend="openldap"/>,
     <xref linkend="gdbm"/>,
-    <xref linkend="db"/>,
+    <!-- <xref linkend="db"/>, -->
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
@@ -135,5 +135,5 @@
     <ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
     <ulink url="http://www.softwareag.com/">Adabas</ulink>,
-    <ulink url="http://www.frontbase.com/">FrontBase</ulink> and
+    <ulink url="http://www.frontbase.com/">FrontBase</ulink>, and
     <ulink url="http://www.mainstreetsoftworks.com/">Monetra</ulink></para>
 
@@ -142,5 +142,5 @@
     <xref linkend="cyrus-sasl"/>,
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
-    <ulink url="http://mcrypt.sourceforge.net/">libmcrypt</ulink> and
+    <ulink url="http://mcrypt.sourceforge.net/">libmcrypt</ulink>, and
     <ulink url="http://mhash.sourceforge.net/">mhash</ulink></para>
 
@@ -158,8 +158,12 @@
     </note>
 
+    <!-- Commenting this out for now as BDB is built in LFS
+
     <para>If you have <application>Berkeley DB</application> installed and
     wish to utilize it, apply the following patch:</para>
 
 <screen><userinput>patch -Np1 -i ../php-&php-version;-db43-1.patch</userinput></screen>
+
+    -->
 
     <note>
@@ -170,9 +174,14 @@
       <ulink url="http://www.php.net/">PHP web site</ulink>
       is highly recommended, as their online docs are very good.</para>
+
+      <para>If, for whatever reason, you don't have <xref linkend="libxml2"/>
+      installed, you need to add <option>--disable-libxml</option> to the
+      <command>configure</command> command in the instructions below. This
+      will prevent the <command>pear</command> command from being built.</para>
     </note>
 
     <!-- Commenting this out as libxml is a recommended dependency.
          Current protocol in the book is to expect folks to have it
-         installed.
+         installed and the note above should take care of it.
 
     <para>Remove the <parameter>-disable-libxml</parameter> switch if you
@@ -184,5 +193,6 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../php-&php-version;-db43-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=/etc \
             --with-apxs2 \
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ general/prog/ruby.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -64,6 +64,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="openssl"/>,
-    <xref linkend="tk"/>,
-    <xref linkend="db"/>, and
+    <xref linkend="tk"/>, and
+    <!-- <xref linkend="db"/>, -->
     <xref linkend="gdbm"/></para>
 
Index: gnome/otherlibs/gconf1.xml
===================================================================
--- gnome/otherlibs/gconf1.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ gnome/otherlibs/gconf1.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -74,10 +74,11 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="oaf"/> and <xref linkend="popt"/></para>
+    <para role="required"><xref linkend="oaf"/> and
+    <xref linkend="popt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="GTK"/>,
-    <xref linkend="db"/>,
-    <xref linkend="guile"/> and
+    <!-- <xref linkend="db"/>, -->
+    <xref linkend="guile"/>, and
     <xref linkend="gtk-doc"/></para>
 
@@ -87,4 +88,6 @@
     <title>Installation of GConf</title>
 
+    <!-- This section commented out as BDB is now built in LFS
+
     <para>If you have <application>Berkeley DB</application> installed,
     apply the following patch:</para>
@@ -92,8 +95,11 @@
 <screen><userinput>patch -Np1 -i ../GConf-&GConf1-version;-db43-2.patch</userinput></screen>
 
+    -->
+
     <para>Install <application>GConf</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../GConf-&GConf1-version;-gcc4-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../GConf-&GConf1-version;-db43-2.patch &amp;&amp;
+patch -Np1 -i ../GConf-&GConf1-version;-gcc4-1.patch &amp;&amp;
 ./configure --prefix=/opt/gnome-1.4 &amp;&amp;
 make</userinput></screen>
Index: gnome/otherlibs/gnome-libs.xml
===================================================================
--- gnome/otherlibs/gnome-libs.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ gnome/otherlibs/gnome-libs.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -73,11 +73,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="ORBit"/>,
-    <xref linkend="GTK"/>,
-    <xref linkend="imlib"/> and
-    <xref linkend="db"/></para>
+    <xref linkend="GTK"/>, and
+    <xref linkend="imlib"/></para>
+    <!-- <xref linkend="db"/> -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="audiofile"/>,
-    <xref linkend="esound"/> and
+    <xref linkend="esound"/>, and
     <xref linkend="gtk-doc"/></para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ introduction/welcome/changelog.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Removed the Berkeley DB dependency from packages
+          utilizing it as BDB is now built in LFS.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to Berkeley DB-4.4.16, added a patch to the
           Python instructions to support the new BDB, updated the Heimdal
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ kde/add/kdeaddons.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -74,5 +74,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 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ kde/devel/kdesdk.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -68,7 +68,7 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="db"/></para>
+    <para role="recommended"><xref linkend="libjpeg"/> and
+    <xref linkend="libxml2"/></para>
+    <!-- <xref linkend="db"/> -->
 
   </sect2>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ postlfs/security/cyrus-sasl.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -84,9 +84,9 @@
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
-    <xref linkend="db"/>,
+    <!-- <xref linkend="db"/>, -->
     <xref linkend="gdbm"/>,
     <!-- <xref linkend="courier"/>,  -->
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-    <ulink url="http://sqlite.org/">SQLite</ulink> and
+    <ulink url="http://sqlite.org/">SQLite</ulink>, and
     <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
 
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ postlfs/security/heimdal.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -83,6 +83,8 @@
 
     <bridgehead renderas="sect4">Required to Build the Server-Side Tools</bridgehead>
-    <para role="required"><xref linkend="db"/> (recommended) or
-    <xref linkend="gdbm"/></para>
+    <para role="required">
+    <!-- <xref linkend="db"/> -->
+    <xref linkend="db"/> is recommended (installed in LFS)
+    or <xref linkend="gdbm"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -94,5 +96,5 @@
     X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
     <xref linkend="cracklib"/> (compiled with the <filename>heimdal</filename>
-    patch) and
+    patch), and
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink></para>
 
Index: postlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ postlfs/security/linux-pam.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -76,8 +76,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="db"/> (for the pam_userdb module),
+    <para role="optional">
+    <!-- <xref linkend="db"/> (for the pam_userdb module), -->
     <ulink url="http://www.prelude-ids.org/">Prelude</ulink> and
-    <ulink
-    url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink></para>
+    <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink></para>
 
   </sect2>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ server/mail/exim.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -71,5 +71,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="db"/> or
+    <para role="required"><xref linkend="db"/> (built in LFS) or
+    <!-- <xref linkend="db"/> -->
     <xref linkend="gdbm"/> or
     <ulink url="http://sourceforge.net/projects/tdb">TDB</ulink></para>
@@ -83,5 +84,5 @@
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
-    <xref linkend="tcpwrappers"/> and
+    <xref linkend="tcpwrappers"/>, and
     <xref linkend="linux-pam"/></para>
 
@@ -99,4 +100,6 @@
 useradd -d /dev/null -c "Exim Daemon" -g exim -s /bin/false -u 31 exim</userinput></screen>
 
+    <!-- Commenting this out as BDB is installed in LFS
+
     <para>If you have <application>Berkeley DB</application>
     installed, apply the following patch:</para>
@@ -104,8 +107,11 @@
 <screen><userinput>patch -Np1 -i ../exim-&exim-version;-db43-1.patch</userinput></screen>
 
+    -->
+
     <para>Install <application>Exim</application> with the following
     commands:</para>
 
-<screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,' \
+<screen><userinput>patch -Np1 -i ../exim-&exim-version;-db43-1.patch &amp;&amp;
+sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,' \
     -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
     -e 's,^EXIM_USER.*$,EXIM_USER=exim,' \
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ server/mail/postfix.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -64,6 +64,10 @@
     <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>
@@ -73,5 +77,5 @@
     <xref linkend="openldap"/>,
     <xref linkend="openssl"/>,
-    <xref linkend="cyrus-sasl"/> and
+    <xref linkend="cyrus-sasl"/>, and
     <ulink url="http://cr.yp.to/cdb.html">cdb</ulink> or
     <ulink url="http://www.corpit.ru/mjt/tinycdb.html">TinyCDB</ulink></para>
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ server/mail/sendmail.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -62,6 +62,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="db"/> and
-    <xref linkend="procmail"/></para>
+    <para role="required"><xref linkend="procmail"/></para>
+    <!-- <xref linkend="db"/> -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ server/major/apache.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -71,5 +71,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="db"/>,
+    <para role="optional">
+    <!-- <xref linkend="db"/>, -->
     <xref linkend="gdbm"/>,
     <xref linkend="openssl"/>,
@@ -79,5 +80,5 @@
     <xref linkend="pcre"/>,
     <xref linkend="pkgconfig"/>,
-    <xref linkend="expat"/> and
+    <xref linkend="expat"/>, and
     <ulink url="http://www.distcache.org/">distcache</ulink></para>
 
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ server/other/openldap.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -69,5 +69,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="db"/> (recommended) or
+    <para role="required"><xref linkend="db"/> is recommended (built in LFS) or
+    <!-- <xref linkend="db"/> -->
     <xref linkend="gdbm"/></para>
 
@@ -80,5 +81,5 @@
     <xref linkend="unixodbc"/>,
     <xref linkend="gmp"/>,
-    <ulink url="http://www.gnu.org/software/pth/">GNU Pth</ulink> and
+    <ulink url="http://www.gnu.org/software/pth/">GNU Pth</ulink>, and
     <ulink url="http://www.openslp.org/">OpenSLP</ulink></para>
 
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision 2a038b2b94c0435aedcf82cb7eb7580c344bd399)
+++ xsoft/suites/openoffice.xml	(revision 3f87e4a3cb8d4e256dd1423a7fbac8dd1caf2579)
@@ -138,5 +138,5 @@
     <xref linkend="cups"/>,
     <xref linkend="curl"/>,
-    <xref linkend="db"/>,
+    <!-- <xref linkend="db"/>, -->
     <xref linkend="desktop-file-utils"/>,
     <ulink url="http://www.easysw.com/epm/">EPM</ulink>,
@@ -155,5 +155,5 @@
     <xref linkend="nas"/>,
     <ulink url="http://www.webdav.org/neon/">neon</ulink>,
-<!--    <xref linkend="openldap"/>, -->
+    <!--    <xref linkend="openldap"/>, -->
     <ulink url="http://www.portaudio.com/">PortAudio</ulink>,
     <xref linkend="python"/>,
