diff --git a/common/shlibs b/common/shlibs
index f70f5a6ff8a..25ac02eb3d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -168,7 +168,7 @@ libgstrtp-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
 libbfd-2.21.so			binutils		binutils-devel
 libopcodes-2.21.so		binutils		binutils-devel
 libdb-4.8.so			libdb			db-devel
-libdb_cxx-4.8.so		libdb			db-devel
+libdb_cxx-4.8.so		libdb-cxx		db-devel
 libgdbm.so.4			gdbm			gdbm-devel
 libgdbm_compat.so.4		gdbm			gdbm-devel
 libgettextsrc-0.18.1.so		gettext-libs		gettext-devel
diff --git a/srcpkgs/db/db-devel.template b/srcpkgs/db/db-devel.template
index 1eb5b3f66a6..948e367b08c 100644
--- a/srcpkgs/db/db-devel.template
+++ b/srcpkgs/db/db-devel.template
@@ -5,13 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libstdc++-devel
-Add_dependency run libdb
+revision=1
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+Add_dependency run libdb
+Add_dependency run libdb-cxx
+
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/share usr
 }
diff --git a/srcpkgs/db/depends b/srcpkgs/db/depends
index 9ce16c57919..00477b675cb 100644
--- a/srcpkgs/db/depends
+++ b/srcpkgs/db/depends
@@ -1,2 +1,2 @@
 abi_depends=">=4.8.24"
-api_depends="${abi_depends}"
+api_depends=">=4.8.30_1" # libdb-cxx
diff --git a/srcpkgs/db/libdb-cxx.rshlibs b/srcpkgs/db/libdb-cxx.rshlibs
new file mode 100644
index 00000000000..7dd29f0bcdf
--- /dev/null
+++ b/srcpkgs/db/libdb-cxx.rshlibs
@@ -0,0 +1,5 @@
+libpthread.so.0
+libstdc++.so.6
+libm.so.6
+libc.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/db/libdb-cxx.template b/srcpkgs/db/libdb-cxx.template
new file mode 100644
index 00000000000..d9319ef5644
--- /dev/null
+++ b/srcpkgs/db/libdb-cxx.template
@@ -0,0 +1,11 @@
+# Template file for 'libdb-cxx'.
+#
+revision=1
+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.rshlibs b/srcpkgs/db/libdb.rshlibs
index 5d3c9f034bf..5c5d2ae913f 100644
--- a/srcpkgs/db/libdb.rshlibs
+++ b/srcpkgs/db/libdb.rshlibs
@@ -1,5 +1,2 @@
 libpthread.so.0
 libc.so.6
-libstdc++.so.6
-libm.so.6
-libgcc_s.so.1
diff --git a/srcpkgs/db/libdb.template b/srcpkgs/db/libdb.template
index 5ba23b6cf86..622c3369790 100644
--- a/srcpkgs/db/libdb.template
+++ b/srcpkgs/db/libdb.template
@@ -1,5 +1,6 @@
 # Template file for 'libdb'.
 #
+revision=1
 short_desc="${short_desc} - shared libraries"
 long_desc="${long_desc}
 
@@ -7,9 +8,7 @@ long_desc="${long_desc}
 
 replaces="db<4.8.26"
 
-
-do_install()
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
+do_install() {
+	vmove "usr/lib/libdb.so*" usr/lib
+	vmove "usr/lib/libdb-*.so*" usr/lib
 }
diff --git a/srcpkgs/db/template b/srcpkgs/db/template
index 92b324d0e60..43b788a7b93 100644
--- a/srcpkgs/db/template
+++ b/srcpkgs/db/template
@@ -7,7 +7,7 @@ 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"
 make_build_args="LIBSO_LIBS=-lpthread"
 short_desc="The Berkeley DB from Oracle"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -37,11 +37,9 @@ long_desc="
    records or requiring that new records be added only at the end of the
    database."
 
-subpackages="libdb db-docs db-devel"
+subpackages="libdb libdb-cxx db-docs db-devel"
 
-post_install()
-{
-	install -d ${DESTDIR}/usr/share/doc/${pkgname}-${version}
-	mv ${DESTDIR}/usr/docs/* ${DESTDIR}/usr/share/doc/${pkgname}-${version}
+post_install() {
+	vmove "usr/docs/*" usr/share/doc/${pkgname}-${version}
 	rmdir ${DESTDIR}/usr/docs
 }
diff --git a/srcpkgs/libdb-cxx b/srcpkgs/libdb-cxx
new file mode 120000
index 00000000000..5baa59d6463
--- /dev/null
+++ b/srcpkgs/libdb-cxx
@@ -0,0 +1 @@
+db
\ No newline at end of file