diff --git a/configure b/configure
index eb879af..0e5b407 100755
--- a/configure
+++ b/configure
@@ -18150,7 +18150,7 @@ if test "x$bdb_required" = "xyes"; then
     trybdbdir=""
     dobdbsearch=yes
     bdb_search_dirs="/usr/local /usr"
-    search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
+    search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4"
 
     bdbfound=no
     savedcflags="$CFLAGS"
diff --git a/etc/cnid_dbd/dbd_add.c b/etc/cnid_dbd/dbd_add.c
index 6a818a3..bad57e7 100644
--- a/etc/cnid_dbd/dbd_add.c
+++ b/etc/cnid_dbd/dbd_add.c
@@ -24,7 +24,7 @@
 #include <atalk/cnid_dbd_private.h>
 #include <atalk/cnid.h>
 #ifdef HAVE_DB4_DB_H
-#include <db4/db.h>
+#include <libdb4/db.h>
 #else
 #include <db.h>
 #endif
diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index 2cc59cb..ef58e15 100644
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -87,7 +87,7 @@ AC_DEFUN([AC_PATH_BDB],[
     trybdbdir=""
     dobdbsearch=yes
     bdb_search_dirs="/usr/local /usr"
-    search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
+    search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4 /libdb4"
 
     bdbfound=no
     savedcflags="$CFLAGS"