diff --git a/package/base/bdb/bdb.conf b/package/base/bdb/bdb.conf
index 55ff2b12e..3dca9b6e1 100644
--- a/package/base/bdb/bdb.conf
+++ b/package/base/bdb/bdb.conf
@@ -26,7 +26,7 @@ echo_status "Set package version number based on name: $ver"
 hook_add preconf 2 'cd build_unix'
 configscript="../dist/configure"
 
-if [ $stagelevel -gt 1 ] ; then
+if [ $stagelevel -ge 2 -a "$( type -p $CXX )" ] ; then
 	var_append extraconfopt ' ' '--enable-cxx'
 fi
 
@@ -48,8 +48,10 @@ fi
 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'
+hook_add postinstall 8 'chmod 755 $libdir/libdb-${xpkg:3:1}.${xpkg:4:1}.so ; \
+	if [ -f $libdir/libdb_cxx-${xpkg:3:1}.${xpkg:4:1}.so ] ; then \
+		chmod 755 $libdir/libdb_cxx-${xpkg:3:1}.${xpkg:4:1}.so
+	fi'
 
 # create yet another alternative library name some programs use
 # this will create symlinks in the form libdb-4.1.so -> libdb41.so