Index: general.ent
===================================================================
--- general.ent	(revision ef1957f8f8cd553dff12f49a66da7d529598d0ec)
+++ general.ent	(revision a9e1d249c9a4eb2e05e6cd5da4c9bd0934670009)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "26">                   <!-- Always 2 digits -->
+<!ENTITY day          "27">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 26th, &year;">
+<!ENTITY releasedate  "June 27th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -598,5 +598,5 @@
 
 <!-- Chapter 22 -->
-<!ENTITY db-version                   "5.3.15">
+<!ENTITY db-version                   "5.3.21">
 <!ENTITY mysql-version                "5.5.17">
 <!ENTITY postgresql-version           "9.0.6">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ef1957f8f8cd553dff12f49a66da7d529598d0ec)
+++ introduction/welcome/changelog.xml	(revision a9e1d249c9a4eb2e05e6cd5da4c9bd0934670009)
@@ -43,4 +43,13 @@
 -->
     <listitem>
+      <para>June 27th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abenton] - Updated Berkeley DB to 5.3.21.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 26th, 2012</para>
       <itemizedlist>
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision ef1957f8f8cd553dff12f49a66da7d529598d0ec)
+++ server/databases/db.xml	(revision a9e1d249c9a4eb2e05e6cd5da4c9bd0934670009)
@@ -5,12 +5,11 @@
   %general-entities;
 
-  <!ENTITY db-download-http "&sources-anduin-http;/d/db-&db-version;.tar.gz">
-  <!ENTITY db-download-ftp  "&sources-anduin-ftp;/d/db-&db-version;.tar.gz">
-  <!ENTITY db-md5sum        "5493fb5f7cc3915887c836b096f18773">
-  <!ENTITY db-size          "33 MB">
-  <!ENTITY db-buildsize     "264 MB (additional 100 MB to run parallel standard
-    test suite)">
-  <!ENTITY db-time          "0.8 SBU (add an additional 145 SBU to run parallel
-    standard test suite)">
+  <!ENTITY db-download-http
+    "http://download.oracle.com/berkeley-db/db-&db-version;.tar.gz">
+  <!ENTITY db-download-ftp  " ">
+  <!ENTITY db-md5sum        "3fda0b004acdaa6fa350bfc41a3b95ca">
+  <!ENTITY db-size          "34 MB">
+  <!ENTITY db-buildsize     "265 MB">
+  <!ENTITY db-time          "0.4 SBU">
 ]>
 
@@ -78,5 +77,5 @@
     <para role="optional">
       <xref linkend="tcl"/>,
-      <xref linkend="openjdk"/><!-- or <xref linkend="jdk"/>-->, and
+      <xref linkend="openjdk"/><!-- or <xref linkend="jdk"/> -->, and
       <xref linkend="sharutils"/> (for the <command>uudecode</command> command)
     </para>
@@ -87,5 +86,5 @@
   </sect2>
 
-  <sect2 role="testing">
+  <!-- <sect2 role="testing">
     <title>Testing Berkeley DB</title>
 
@@ -106,9 +105,9 @@
 
 <screen><userinput>cd build_unix                         &amp;&amp;
-../dist/configure --prefix=/usr       \
-                  --enable-test       \
-                  --enable-tcl        \
-                  --enable-dbm        \
-                  --with-tcl=/usr/lib &amp;&amp;
+../dist/configure -&#45;prefix=/usr       \
+                  -&#45;enable-test       \
+                  -&#45;enable-tcl        \
+                  -&#45;enable-dbm        \
+                  -&#45;with-tcl=/usr/lib &amp;&amp;
 make</userinput></screen>
 
@@ -145,15 +144,15 @@
       run the tests.
     </para>
-  </sect2>
+  </sect2> -->
 
   <sect2 role="installation" id="bdb-installation">
     <title>Installation of Berkeley DB</title>
 
-    <note>
+    <!-- <note>
       <para>
         If you plan on installing <application>Berkeley DB</application> with
         Java support, you should check the system for certain versions of
-       <!-- <xref linkend="jdk"/> and--> <xref linkend="gmime"/>. Specifically, if
-        <application>JDK</application>-6 Update X and the
+       <xref linkend="jdk"/> and <xref linkend="gmime"/>. Specifically,
+        if <application>JDK</application>-6 Update X and the
         <command>uudecode</command> program from the
         <application>GMime</application> program is on the system, the build
@@ -161,5 +160,5 @@
         command shown below). You can run two commands
         (<command>javac -version</command> and
-        <command>uudecode --version</command>) to determine what versions are
+        <command>uudecode -&#45;version</command>) to determine what versions are
         installed. You can also download and run a shell script from
         <ulink url="&files-anduin;/jdk-uudecode-check.sh"/> that will alert you
@@ -169,6 +168,6 @@
       </para>
 
-<screen><userinput>uudecode="no" ../dist/configure --(use the parameters shown below)</userinput></screen>
-    </note>
+<screen><userinput>uudecode="no" ../dist/configure -&#45;(use the parameters shown below)</userinput></screen>
+    </note> -->
 
     <para>
@@ -209,28 +208,16 @@
 
     <para>
-      <parameter>--enable-compat185</parameter>: This switch enables building
+      <option>--enable-compat185</option>: This switch enables building
       the DB-1.85 compatibility API.
     </para>
 
     <para>
-      <parameter>--enable-cxx</parameter>: This switch enables building C++ API
+      <option>--enable-cxx</option>: This switch enables building C++ API
       libraries.
     </para>
 
     <para>
-      <parameter>--enable-tcl --with-tcl=/usr/lib</parameter>: Enables
-      <application>Tcl</application> support in DB and creates the
-      <filename class="libraryfile">libdb_tcl</filename> libraries.
-    </para>
-
-    <para>
-      <parameter>--enable-dbm</parameter>: Enables legacy interface support
+      <option>--enable-dbm</option>: Enables legacy interface support
       needed by some older packages.
-    </para>
-
-    <para>
-      <parameter>--enable-java</parameter>: Enables
-      <application>Java</application> support in DB and creates the
-      <filename class="libraryfile">libdb_java</filename> libraries.
     </para>
 
@@ -245,4 +232,16 @@
       ownership of various installed files from the uid:gid of the builder to
       root:root.
+    </para>
+
+    <para>
+      <option>--enable-tcl --with-tcl=/usr/lib</option>: Enables
+      <application>Tcl</application> support in DB and creates the
+      <filename class="libraryfile">libdb_tcl</filename> libraries.
+    </para>
+
+    <para>
+      <option>--enable-java</option>: Enables
+      <application>Java</application> support in DB and creates the
+      <filename class="libraryfile">libdb_java</filename> libraries.
     </para>
   </sect2>
@@ -258,10 +257,22 @@
       <seglistitem>
         <seg>
-          db_archive, db_checkpoint, db_deadlock, db_dump, db_hotbackup,
-          db_load, db_log_verify, db_printlog, db_recover, db_replicate,
-          db_stat, db_tuner, db_upgrade and db_verify.
+          db_archive,
+          db_checkpoint,
+          db_deadlock,
+          db_dump,
+          db_hotbackup,
+          db_load,
+          db_log_verify,
+          db_printlog,
+          db_recover,
+          db_replicate,
+          db_stat,
+          db_tuner,
+          db_upgrade and
+          db_verify.
         </seg>
         <seg>
-          libdb.so, libdb_cxx.so, libdb_java.so, libdb_tcl.so and db.jar.
+          libdb.so and
+          libdb_cxx.so
         </seg>
         <seg>/usr/share/doc/db-&db-version;</seg>
