diff --git a/ChangeLog b/ChangeLog
index 184b9547ed..3a32ba795c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
 	* configure.in: fix a typo in the help (was --diable-gui).  Fixes #131414
 
+	* configure.in: add db-4.2 to the list of databases we search.
+	  We probably need a better mechanism to search for a working db
+	  library, like defining our own macro and just supplying a list.
+	  We probably can get rid of the prefer-db1 option as well, maybe?
+	  Fixes #131506
+
 2004-01-15  Derek Atkins  <derek@ihtfp.com>
 
 	* src/app-utils/options.scm: Create two new functions to centralize
diff --git a/configure.in b/configure.in
index c7f062ecea..d832c21bec 100644
--- a/configure.in
+++ b/configure.in
@@ -763,7 +763,11 @@ if test "$prefer_db1" = "yes"; then
    AC_CHECK_LIB(db-3, __db185_open, DB_LIBS="-ldb-3",
     AC_CHECK_LIB(db-4.0, __db185_open, DB_LIBS="-ldb-4.0",
      AC_CHECK_LIB(db-4.1, __db185_open, DB_LIBS="-ldb-4.1",
-      AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
+      AC_CHECK_LIB(db-4.2, __db185_open, DB_LIBS="-ldb-4.2",
+       AC_CHECK_LIB(db, __db185_open, DB_LIBS="-ldb",
+        AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
+       )
+      )
      )
     )
    )
@@ -775,7 +779,11 @@ else
    AC_CHECK_LIB(db-3, __db185_open, DB_LIBS="-ldb-3",
     AC_CHECK_LIB(db-4.0, __db185_open, DB_LIBS="-ldb-4.0",
      AC_CHECK_LIB(db-4.1, __db185_open, DB_LIBS="-ldb-4.1",
-      AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
+      AC_CHECK_LIB(db-4.2, __db185_open, DB_LIBS="-ldb-4.2",
+       AC_CHECK_LIB(db, __db185_open, DB_LIBS="-ldb",
+        AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode])
+       )
+      )
      )
     )
    )