diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe
index 7f7651450..c66848af8 100644
--- a/dev-db/db/db-4.8.30.recipe
+++ b/dev-db/db/db-4.8.30.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases
 HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/db-${portVersion}.tar.gz"
 CHECKSUM_MD5="f80022099c5742cd179343556179aa8c"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 LICENSE="SleepyCat"
@@ -13,25 +13,25 @@ COPYRIGHT="1990-2013, Oracle
 	2000-2005, INRIA - France Telecom"
 
 PROVIDES="
-	db${secondaryArchSuffix} = $portVersion
-	cmd:db_archive
-	cmd:db_checkpoint
-	cmd:db_deadlock
-	cmd:db_dump
-	cmd:db_hotbackup
-	cmd:db_load
-	cmd:db_printlog
-	cmd:db_recover
-	cmd:db_stat
-	cmd:db_sql
-	cmd:db_upgrade
-	cmd:db_verify
-	lib:libdb_4.8
-	lib:libdb_4
-	lib:libdb
-	lib:libdb_cxx
-	lib:libdb_cxx_4.8
-	lib:libdb_cxx_4
+	db${secondaryArchSuffix} = $portVersion compat >= 4.8
+	cmd:db_archive${secondaryArchSuffix}
+	cmd:db_checkpoint${secondaryArchSuffix}
+	cmd:db_deadlock${secondaryArchSuffix}
+	cmd:db_dump${secondaryArchSuffix}
+	cmd:db_hotbackup${secondaryArchSuffix}
+	cmd:db_load${secondaryArchSuffix}
+	cmd:db_printlog${secondaryArchSuffix}
+	cmd:db_recover${secondaryArchSuffix}
+	cmd:db_stat${secondaryArchSuffix}
+	cmd:db_sql${secondaryArchSuffix}
+	cmd:db_upgrade${secondaryArchSuffix}
+	cmd:db_verify${secondaryArchSuffix}
+	lib:libdb_4.8${secondaryArchSuffix}
+	lib:libdb_4${secondaryArchSuffix}
+	lib:libdb${secondaryArchSuffix}
+	lib:libdb_cxx${secondaryArchSuffix}
+	lib:libdb_cxx_4.8${secondaryArchSuffix}
+	lib:libdb_cxx_4${secondaryArchSuffix}
 	"
 REQUIRES="
     haiku${secondaryArchSuffix} >= $haikuVersion
@@ -47,7 +47,6 @@ BUILD_PREREQUIRES="
 	"
 
 PATCHES="db-${portVersion}.patch"
-SOURCE_DIR="db-${portVersion}"
 
 BUILD()
 {
@@ -79,11 +78,11 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	db${secondaryArchSuffix}_devel = $portVersion
-	devel:libdb$secondaryArchSuffix = $portVersion
-	devel:libdb_4.8$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx_4.8$secondaryArchSuffix = $portVersion
+	db${secondaryArchSuffix}_devel = $portVersion compat >= 4.8
+	devel:libdb${secondaryArchSuffix} = $portVersion
+	devel:libdb_4.8${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx_4.8${secondaryArchSuffix} = $portVersion
 	"
 
 REQUIRES_devel="
diff --git a/dev-db/db/db-5.3.28.recipe b/dev-db/db/db-5.3.28.recipe
index 976880726..afa37f969 100644
--- a/dev-db/db/db-5.3.28.recipe
+++ b/dev-db/db/db-5.3.28.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases
 HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz"
 CHECKSUM_MD5="b99454564d5b4479750567031d66fe24"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 LICENSE="SleepyCat"
@@ -13,27 +13,27 @@ COPYRIGHT="1990-2013, Oracle
 	2000-2005, INRIA - France Telecom"
 
 PROVIDES="
-	db${secondaryArchSuffix} = $portVersion
-	cmd:db_archive
-	cmd:db_checkpoint
-	cmd:db_deadlock
-	cmd:db_dump
-	cmd:db_hotbackup
-	cmd:db_load
-	cmd:db_log_verify
-	cmd:db_printlog
-	cmd:db_recover
-	cmd:db_replicate
-	cmd:db_stat
-	cmd:db_tuner
-	cmd:db_upgrade
-	cmd:db_verify
-	lib:libdb_5.3
-	lib:libdb_5
-	lib:libdb
-	lib:libdb_cxx
-	lib:libdb_cxx_5.3
-	lib:libdb_cxx_5
+	db${secondaryArchSuffix} = $portVersion compat >= 5.3
+	cmd:db_archive${secondaryArchSuffix}
+	cmd:db_checkpoint${secondaryArchSuffix}
+	cmd:db_deadlock${secondaryArchSuffix}
+	cmd:db_dump${secondaryArchSuffix}
+	cmd:db_hotbackup${secondaryArchSuffix}
+	cmd:db_load${secondaryArchSuffix}
+	cmd:db_log_verify${secondaryArchSuffix}
+	cmd:db_printlog${secondaryArchSuffix}
+	cmd:db_recover${secondaryArchSuffix}
+	cmd:db_replicate${secondaryArchSuffix}
+	cmd:db_stat${secondaryArchSuffix}
+	cmd:db_tuner${secondaryArchSuffix}
+	cmd:db_upgrade${secondaryArchSuffix}
+	cmd:db_verify${secondaryArchSuffix}
+	lib:libdb_5.3${secondaryArchSuffix}
+	lib:libdb_5${secondaryArchSuffix}
+	lib:libdb${secondaryArchSuffix}
+	lib:libdb_cxx${secondaryArchSuffix}
+	lib:libdb_cxx_5.3${secondaryArchSuffix}
+	lib:libdb_cxx_5${secondaryArchSuffix}
 	"
 REQUIRES="
     haiku${secondaryArchSuffix} >= $haikuVersion
@@ -81,11 +81,11 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	db${secondaryArchSuffix}_devel = $portVersion
-	devel:libdb$secondaryArchSuffix = $portVersion
-	devel:libdb_5.3$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx_5.3$secondaryArchSuffix = $portVersion
+	db${secondaryArchSuffix}_devel = $portVersion compat >= 5.3
+	devel:libdb${secondaryArchSuffix} = $portVersion
+	devel:libdb_5.3${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx_5.3${secondaryArchSuffix} = $portVersion
 	"
 
 REQUIRES_devel="