--- configure.in.orig	2007-02-27 15:15:54.000000000 +0100
+++ configure.in	2007-02-27 17:56:44.000000000 +0100
@@ -645,24 +645,24 @@
                 fi
 	    done
         done
     fi
     if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in db43 db42 db41 db4 db3 db2 ; do
-            if test -d "/usr/local/include/$v" ; then
+        for v in 4.2 4.1 4 3 2 ; do
+            if test -d "/usr/local/include/db$v" ; then
                 BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
-                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
-                BERKELEY_DB_LIB="-l$v"
+                BERKELEY_DB_CFLAGS="-I/usr/local/include/db$v"
+                BERKELEY_DB_LIB="-ldb-$v"
                 AC_MSG_RESULT(FreeBSD locations)
                 break
             fi
         done
         if test x"$BERKELEY_DB_LIB" = x ; then
-            for v in db43 db42 db41 db4 db3 db2 ; do
-                if test -d "/usr/include/$v" ; then
-                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
-                    BERKELEY_DB_LIB="-l$v"
+            for v in 4.2 4.1 4 3 2 ; do
+                if test -d "/usr/include/db$v" ; then
+                    BERKELEY_DB_CFLAGS="-I/usr/include/db$v"
+                    BERKELEY_DB_LIB="-ldb-$v"
                     AC_MSG_RESULT(Linux locations)
                     break
                 fi
             done
             if test x"$BERKELEY_DB_LIB" = x ; then