diff --git a/srcpkgs/db/db-devel.template b/srcpkgs/db/db-devel.template
index 9edaae683c..8ef8fe81e6 100644
--- a/srcpkgs/db/db-devel.template
+++ b/srcpkgs/db/db-devel.template
@@ -1,15 +1,10 @@
 # Template file for 'db-devel'.
 #
-depends="libdb libdb-cxx"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
+depends="libdb>=${version} libdb-cxx>=${version}"
+short_desc="${short_desc} -- development files"
+noarch=yes
 
 do_install() {
 	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
 	vmove usr/share usr
 }
diff --git a/srcpkgs/db/db-docs.template b/srcpkgs/db/db-docs.template
index fd62f4ccb3..49b85ad8f3 100644
--- a/srcpkgs/db/db-docs.template
+++ b/srcpkgs/db/db-docs.template
@@ -1,14 +1,9 @@
 # Template file for 'db-docs'.
 #
-short_desc="${short_desc} (documentation files)"
-long_desc="${long_desc}
-
- This package contains the documentation files for the API and utilities."
-
+short_desc="${short_desc} -- documentation files"
 noarch=yes
 
-do_install()
-{
+do_install() {
 	install -d ${DESTDIR}/usr/share
 	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/db/libdb-cxx.template b/srcpkgs/db/libdb-cxx.template
index e8c0e4753f..ffc5ed9a61 100644
--- a/srcpkgs/db/libdb-cxx.template
+++ b/srcpkgs/db/libdb-cxx.template
@@ -1,9 +1,6 @@
 # Template file for 'libdb-cxx'.
 #
 short_desc="${short_desc} - C++ shared libraries"
-long_desc="${long_desc}
-
- This package contains the C++ shared library for use in client programs."
 
 do_install() {
 	vmove "usr/lib/libdb_cxx*.so*" usr/lib
diff --git a/srcpkgs/db/libdb.template b/srcpkgs/db/libdb.template
index 4faf333080..383676a0dc 100644
--- a/srcpkgs/db/libdb.template
+++ b/srcpkgs/db/libdb.template
@@ -1,10 +1,6 @@
 # Template file for 'libdb'.
 #
-short_desc="${short_desc} - shared libraries"
-long_desc="${long_desc}
-
- This package contains the shared libraries for use in client programs."
-
+short_desc="${short_desc} -- C shared libraries"
 replaces="db<4.8.26"
 
 do_install() {
diff --git a/srcpkgs/db/template b/srcpkgs/db/template
index 61a2c885a2..44dfdc12ba 100644
--- a/srcpkgs/db/template
+++ b/srcpkgs/db/template
@@ -1,44 +1,21 @@
 # Template file for 'db'
 pkgname=db
 version=4.8.30
+revision=3
 wrksrc="db-${version}"
-distfiles="http://download.oracle.com/berkeley-db/db-${version}.tar.gz"
+subpackages="libdb libdb-cxx db-docs db-devel"
 build_style=gnu-configure
 build_wrksrc="build_unix"
 configure_script="../dist/configure"
 configure_args="--enable-compat185 --enable-cxx --enable-o_direct
---enable-posixmutexes"
+ --enable-posixmutexes --disable-static"
 make_build_args="LIBSO_LIBS=-lpthread"
-revision=2
 short_desc="The Berkeley DB from Oracle"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.oracle.com/technetwork/products/berkeleydb/overview/index.html"
+license="BSD"
+distfiles="http://download.oracle.com/berkeley-db/db-${version}.tar.gz"
 checksum=e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f96147ab46141e0045db72a
-long_desc="
- Berkeley DB is an embeddable database system that supports keyed access to
- data. The software is distributed in source code form, and developers can
- compile and link the source code into a single library for inclusion
- directly in their applications.
-
- Developers may choose to store data in any of several different storage
- structures to satisfy the requirements of a particular application. In
- database terminology, these storage structures and the code that operates on
- them are called access methods. The library includes support for the
- following access methods:
-
- * B+tree: Stores keys in sorted order, using either a programmer-supplied
-   ordering function or a default function that does lexicographical
-   ordering of keys. Applications may perform equality or range searches.
- * Hashing: Stores records in a hash table for fast searches based on
-   strict equality. Extended Linear Hashing modifies the hash function
-   used by the table as new records are inserted, in order to keep buckets
-   underfull in the steady state.
- * Fixed and Variable-Length Records: Stores fixed- or variable-length
-   records in sequential order. Record numbers may be immutable or
-   mutable, i.e., permitting new records to be inserted between existing
-   records or requiring that new records be added only at the end of the
-   database."
-
-subpackages="libdb libdb-cxx db-docs db-devel"
 
 post_install() {
 	vmove "usr/docs/*" usr/share/doc/${pkgname}-${version}