diff --git a/configure.in b/configure.in
index f9dba7134..bac61d0a6 100644
--- a/configure.in
+++ b/configure.in
@@ -449,8 +449,12 @@ AC_FIND_FUNC_NO_LIBS2(dbopen, $berkeley_db, [
 ],[NULL, 0, 0, 0, NULL])
 
 AC_FIND_FUNC_NO_LIBS(dbm_firstkey, $berkeley_db gdbm ndbm)
+AC_FIND_FUNC_NO_LIBS(db_create, $berkeley_db)
 
 DBLIB="$LIB_dbopen"
+if test "$LIB_dbopen" != "$LIB_db_create"; then
+        DBLIB="$DBLIB $LIB_db_create"
+fi
 if test "$LIB_dbopen" != "$LIB_dbm_firstkey"; then
 	DBLIB="$DBLIB $LIB_dbm_firstkey"
 fi
@@ -958,7 +962,7 @@ fi
 
 AC_MSG_CHECKING(for streamspty)
 case "$host" in
-*-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux10*)
+*-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux1[[01]]*)
 	krb_cv_sys_streamspty=no
 	;;
 *)