diff --git a/configure.in b/configure.in
index c05de97ef..e23e09296 100644
--- a/configure.in
+++ b/configure.in
@@ -237,11 +237,9 @@ dnl Checks for libraries.
 
 AC_FIND_FUNC(socket, socket)
 AC_FIND_FUNC(gethostbyname, nsl)
-AC_FIND_FUNC(dbopen, $berkeley_db)
-AC_FIND_FUNC(dbm_firstkey, $berkeley_db gdbm ndbm)
 AC_FIND_FUNC(syslog, syslog)
 
-AC_FIND_FUNC(logwtmp, util)
+AC_FIND_FUNC_NO_LIBS(logwtmp, util)
 AC_FIND_FUNC_NO_LIBS(tgetent, termcap)
 AC_FIND_FUNC(gethostbyname2, inet6 ip6)
 AC_FIND_FUNC(inet_ntop, inet6 ip6)
@@ -252,10 +250,21 @@ dnl Checks for library functions.
 AC_BROKEN_SNPRINTF
 AC_BROKEN_VSNPRINTF
 
+dnl these should happen after tests for *snprintf
+
+AC_FIND_FUNC_NO_LIBS(dbopen, $berkeley_db)
+AC_FIND_FUNC_NO_LIBS(dbm_firstkey, $berkeley_db gdbm ndbm)
+
+DBLIB="$LIB_dbopen"
+if test "$LIB_dbopen" != "$LIB_dbm_firstkey"; then
+	DBLIB="$DBLIB $LIB_dbm_firstkey"
+fi
+AC_SUBST(DBLIB)dnl
+
 AC_CHECK_FUNCS(_getpty _scrsize asnprintf asprintf dn_expand fcntl)
 AC_CHECK_FUNCS(gethostname getlogin)
 AC_CHECK_FUNCS(getmsg getrlimit getspnam getspuid gettimeofday getuid)
-AC_CHECK_FUNCS(grantpt logwtmp mktime ptsname rand random)
+AC_CHECK_FUNCS(grantpt mktime ptsname rand random)
 AC_CHECK_FUNCS(revoke res_search select setitimer setlogin setpcred setpgid)
 AC_CHECK_FUNCS(setregid setresgid setresuid setreuid setutent)
 AC_CHECK_FUNCS(setsid setsockopt sigaction strstr)