Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
+++ server/databases/db.xml	(revision ab7b9fcc273d759ef3a38eb2e5ae74c1c0d4d7d0)
@@ -6,9 +6,9 @@
 
   <!ENTITY db-download-http "http://download-east.oracle.com/berkeley-db/db-&db-version;.tar.gz">
-  <!ENTITY db-download-ftp  "&gentoo-ftp-repo;/db-&db-version;.tar.gz">
-  <!ENTITY db-md5sum        "3476bac9ec0f3c40729c8a404151d5e3">
-  <!ENTITY db-size          "22.8 MB">
-  <!ENTITY db-buildsize     "250 MB (additional 100 MB to run parallel standard test suite)">
-  <!ENTITY db-time          "1.9 SBU (builds all bindings, add an additional 145 SBU to run parallel standard test suite)">
+  <!ENTITY db-download-ftp  " ">
+  <!ENTITY db-md5sum        "76fcbfeebfcd09ba0b4d96bfdf8d884d">
+  <!ENTITY db-size          "30 MB">
+  <!ENTITY db-buildsize     "267 MB (additional 170 MB to run parallel standard test suite with all bindings)">
+  <!ENTITY db-time          "2.1 SBU (builds all bindings, add an additional 160 SBU to run parallel standard test suite)">
 ]>
 
@@ -79,8 +79,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="tcl"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>, and
-    <ulink url="http://www.gnu.org/software/sharutils/">sharutils</ulink>
-    (for the <command>uudecode</command> command)</para>
+    <para role="optional"><xref linkend="tcl"/>, and
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -100,24 +98,20 @@
     test suite.</para>
 
-    <para>Build for the <application>Berkeley DB</application> test by running
-    the following commands:</para>
+    <para>Build for the <application>Berkeley DB</application> test suite by
+    running the following commands (add <parameter>--enable-java</parameter> if
+    you wish to test the java bindings):</para>
 
 <screen><userinput>cd build_unix &amp;&amp;
-../dist/configure --prefix=/usr \
+uudecode="no" ../dist/configure --prefix=/usr \
                   --enable-test \
                   --enable-tcl  \
+                  --enable-sql  \
                   --with-tcl=/usr/lib &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, start <command>tclsh</command>:</para>
-
-<screen><userinput>tclsh</userinput></screen>
-
-    <para>From the <command>tclsh</command> prompt (<prompt>%&nbsp;</prompt>),
-    run:</para>
-
-<screen><userinput>source ../test/test.tcl
-run_parallel 5 run_std
-exit</userinput></screen>
+    <para>To test <application>Berkeley DB</application>, issue the following
+    command:</para>
+
+<screen><userinput>echo "source ../test/tcl/test.tcl; run_parallel 5 run_std; exit;" | tclsh</userinput></screen>
 
     <para>Clean up the source tree with the following command:</para>
@@ -136,5 +130,5 @@
     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>
@@ -147,13 +141,13 @@
       fail (unless you run the modified <command>./configure</command> command
       shown below). You can run two commands (<command>javac -version</command>
-      and <command>uudecode --version</command>) to determine what versions are
+      and <command>uudecode - -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 to a non-working condition. If the identified programs exist on the
       system, you must modify the
-      <command>./configure</command> command as shown below.</para>
-
-<screen><userinput>uudecode="no" ../dist/configure --(use the parameters shown below)</userinput></screen>
-    </note>
+      <command>./configure</command> command as shown below.</para> 
+
+<screen><userinput>uudecode="no" ../dist/configure - -(use the parameters shown below)</userinput></screen>
+    </note> -->
 
     <para>Install <application>Berkeley DB</application> by running the
@@ -161,7 +155,8 @@
 
 <screen><userinput>cd build_unix &amp;&amp;
-../dist/configure --prefix=/usr \
+uudecode="no" ../dist/configure --prefix=/usr \
                   --enable-compat185 \
-                  --enable-cxx &amp;&amp;
+                  --enable-cxx \
+                  --enable-sql &amp;&amp;
 make</userinput></screen>
 
@@ -169,10 +164,40 @@
 
 <screen role="root"><userinput>make docdir=/usr/share/doc/db-&db-version; install &amp;&amp;
+touch /usr/include/sqlite.h
 chown -v -R root:root \
-      /usr/bin/berkeley_db_svc \
       /usr/bin/db_* \
-      /usr/include/db{,_185,_cxx}.h \
-      /usr/lib/libdb{{,_cxx}.a,{,_cxx,_java,_tcl}-4.8.{so,a,la}} \
+      /usr/bin/dbsql \
+      /usr/include/db{,_185,_cxx,sql}.h \
+      /usr/lib/libdb{,_cxx,_sql}{.a,.so,-5.so,-5.1.{a,la,so}} \
       /usr/share/doc/db-&db-version;</userinput></screen>
+
+    <para>If you compiled <application>Berkeley DB</application> with
+    <application>TCL</application> support, complete the
+    <application>TCL</application> installation with the following commands
+    while still the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>chown -v root:root \
+      /usr/lib/libdb_tcl{.a,.so,-5.so,-5.1.{a,la,so}}</userinput></screen>
+
+    <para>If you compiled <application>Berkeley DB</application> with
+    <application>Java</application> support, complete the
+    <application>Java</application> installation with the following commands
+    while still the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>chown -v root:root \
+      /usr/lib/libdb_java{.so,-5.so,-5.1{.a,.la,.so,_g.so}} \
+      /usr/lib/db.jar</userinput></screen>
+
+    <para>Finaly, if you've configured <application>Berkeley DB</application>
+    with the <parameter>--enable-sql_compat</parameter> parameter to provide
+    <application>SQLite3</application> compatibility, complete the installation
+    with the following commands while still the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>touch /usr/include/sqlite3.h &amp;&amp;
+chown -v root:root \
+      /usr/bin/sqlite3 \
+      /usr/include/sqlite3.h \
+      /usr/lib/libsqlite3.{a,la,so}</userinput></screen>
 
   </sect2>
@@ -182,8 +207,10 @@
 
     <para><command>cd build_unix &amp;&amp;
-    ../dist/configure --prefix=/usr...</command>:
+    uudecode="no" ../dist/configure --prefix=/usr...</command>:
     This replaces the normal <command>./configure</command> command, as
     <application>Berkeley DB</application> comes with various
-    build directories for different platforms.</para>
+    build directories for different platforms.  The additional
+    <envar>uudecode="no"</envar> environment variable ensures that
+    the build will complete if <xref linkend="gmime"/> is intsalled.</para>
 
     <para><parameter>--enable-compat185</parameter>: This switch enables
@@ -200,4 +227,11 @@
     <application>Java</application> support in DB and creates the
     <filename class='libraryfile'>libdb_java</filename> libraries.</para>
+
+    <para><parameter>--enable-sql</parameter>: Enables SQL support in
+    DB and creates the <filename class='libraryfile'>libdb_sql</filename>
+    libraries.</para>
+
+    <para><parameter>--enable-sql_compat</parameter>: enables building of the
+    <application>SQLite3</application> compatible binaries and libs.</para>
 
     <para><command>make docdir=/usr/share/doc/db-&db-version;
@@ -206,7 +240,10 @@
     <filename class='directory'>/usr/docs</filename>.</para>
 
-    <para><command>chown -v -R root:root ...</command>:This command changes
+    <para><command>chown -v -R root:root ...</command>:These commands change
     the ownership of various installed files from the uid:gid of the
     builder to root:root.</para>
+
+    <para><command>touch /usr/include/sqlite3.h</command>: This command updates
+    the timestamp of the installed sqlite3 header.</para>
 
   </sect2>
@@ -227,7 +264,8 @@
       <seglistitem>
         <seg>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>
+        db_load, db_printlog, db_recover, db_stat, db_upgrade, db_verify, 
+        dbsql, sqlite3</seg>
+        <seg>libdb.{so,a}, libdb_cxx.{so,a}, libdb_java{_g.so,.{so,a},
+        libdb_tcl.{so,a}, libdb_sql.{so.a} and db.jar</seg>
         <seg>/usr/share/doc/db-&db-version;</seg>
       </seglistitem>
@@ -346,4 +384,25 @@
       </varlistentry>
 
+      <varlistentry id="dbsql">
+        <term><command>dbsql</command></term>
+        <listitem>
+          <para>is a terminal-based front-end to the dbsql library that can
+          evaluate queries interactively and display the results.</para>
+          <indexterm zone="db dbsql">
+            <primary sortas="b-dbsql">dbsql</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="db_sqlite3">
+        <term><command>sqlite3</command></term>
+        <listitem>
+          <para>is a SQLite3 compatable inteface for dbsql.</para>
+          <indexterm zone="db sqlite3">
+            <primary sortas="b-sqlite3">sqlite3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
+++ server/mail/exim.xml	(revision ab7b9fcc273d759ef3a38eb2e5ae74c1c0d4d7d0)
@@ -93,5 +93,6 @@
     <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
-    <xref linkend="sqlite"/>,
+    <xref linkend="sqlite"/> or <xref linkend="db"/>
+    (with <application>SQLite3</application> compatibility),
     <xref linkend="tcpwrappers"/>, and
     <xref linkend="linux-pam"/></para>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
+++ server/major/apache.xml	(revision ab7b9fcc273d759ef3a38eb2e5ae74c1c0d4d7d0)
@@ -85,5 +85,6 @@
     <xref linkend="unixodbc"/>,
     <xref linkend="postgresql"/>, and
-    <xref linkend="sqlite"/></para>
+    <xref linkend="sqlite"/> or <xref linkend="db"/>
+    (with <application>SQLite3</application> compatibility)</para>
 
     <para>Though you can install APR and APR-util as separate components,
Index: server/major/samba3.xml
===================================================================
--- server/major/samba3.xml	(revision b66ece3527481e2aeaa16192342f6f26149e2e43)
+++ server/major/samba3.xml	(revision ab7b9fcc273d759ef3a38eb2e5ae74c1c0d4d7d0)
@@ -93,5 +93,6 @@
     <bridgehead renderas="sect4">Optional for Samba4 Support</bridgehead>
     <para role="optional"><xref linkend="gnutls"/> (recommended) and
-    <xref linkend="sqlite"/></para>
+    <xref linkend="sqlite"/> or <xref linkend="db"/>
+    (with <application>SQLite3</application> compatibility)</para>
 
     <para condition="html" role="usernotes">User Notes:
