diff --git a/package/base/bdb/bdb.conf b/package/base/bdb/bdb.conf
index 959ccbd22..55ff2b12e 100644
--- a/package/base/bdb/bdb.conf
+++ b/package/base/bdb/bdb.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -26,11 +27,11 @@ hook_add preconf 2 'cd build_unix'
 configscript="../dist/configure"
 
 if [ $stagelevel -gt 1 ] ; then
-	var_append confopt ' ' '--enable-cxx'
+	var_append extraconfopt ' ' '--enable-cxx'
 fi
 
-var_append confopt ' ' '--enable-compat185'
-var_append confopt ' ' "--includedir=$root/$prefix/include/${xpkg:1}"
+var_append extraconfopt ' ' '--enable-compat185'
+includedir="$includedir/${xpkg:1}"
 
 is_bdb_default() {
 	[ "$xpkg" = "$ROCKCFG_PKG_BDB_DEFAULT" ]
@@ -44,8 +45,8 @@ if ! is_bdb_default; then
 fi
 
 # bdb doesn't like some of our make options
-makeopt="docdir=$docdir all"
-makeinstopt="docdir=$docdir install"
+makeopt="docdir=${docdir#$root} all"
+makeinstopt="docdir=${docdir#$root} DESTDIR=$root install"
 
 hook_add postinstall 8 'chmod 755 $libdir/libdb-${xpkg:3:1}.${xpkg:4:1}.so \
 	$libdir/libdb_cxx-${xpkg:3:1}.${xpkg:4:1}.so'
@@ -62,8 +63,8 @@ if is_bdb_default; then
 	# default headers
 	hook_add postmake 3 "ln -sfv ${xpkg:1}/db.h $root/$prefix/include/db.h"
 	hook_add postmake 3 "ln -sfv ${xpkg:1}/db_185.h $root/$prefix/include/db_185.h"
-	hook_add postmake 3 "[ -e $includedir/db ] || \
-		ln -sfv ${xpkg:1} $includedir/db"
+	hook_add postmake 3 "[ -e $includedir/../db ] || \
+		ln -sfv ${xpkg:1} $includedir/../db"
 	
 	# default libs
 	hook_add postmake 5 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.so $libdir/libdb.so'
@@ -76,14 +77,14 @@ then
 	hook_add postmake 3 'ln -svf libdb-3.3.a $libdir/libdb-3.a'
 	hook_add postmake 3 'ln -svf libdb_cxx-3.3.a $libdir/libdb_cxx-3.a'
 
-	# default for it's major version
-	hook_add postmake 4 '[ -e $includedir/${xpkg:1:3} ] || \
-		     ln -svf ${xpkg:1} $includedir/${xpkg:1:3}'
+	# default for its major version
+	hook_add postmake 4 '[ -e $includedir/../${xpkg:1:3} ] || \
+		     ln -svf ${xpkg:1} $includedir/../${xpkg:1:3}'
 else
 	if is_bdb_default; then
-		# default for it's major version
-		hook_add postmake 4 '[ -e $includedir/${xpkg:1:3} ] || \
-			     ln -svf ${xpkg:1} $includedir/${xpkg:1:3}'
+		# default for its major version
+		hook_add postmake 4 '[ -e $includedir/../${xpkg:1:3} ] || \
+			     ln -svf ${xpkg:1} $includedir/../${xpkg:1:3}'
 		hook_add postmake 5 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.so $libdir/libdb${xpkg:3:1}.so'
 		hook_add postmake 5 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.a  $libdir/libdb${xpkg:3:1}.a'
 	fi
diff --git a/package/base/bdb/bdb.desc b/package/base/bdb/bdb.desc
index cdbb5d422..e8e9071ec 100644
--- a/package/base/bdb/bdb.desc
+++ b/package/base/bdb/bdb.desc
@@ -51,7 +51,7 @@
 [L] BSD
 [S] Stable
 
-[P] X --?--5---9 103.200
+[P] X --X--5---9 103.200
 
 [CV-URL] http://dev.sleepycat.com/downloads/releasehistorybdb.html