--- configure.orig	Mon Mar 20 05:14:57 2006
+++ configure	Sat Jul  8 16:05:45 2006
@@ -7607,10 +7607,17 @@
     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
-                BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
-                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
-                BERKELEY_DB_LIB="-l$v"
-                echo "$ac_t""FreeBSD locations" 1>&6
+		if test `uname` = OpenBSD; then
+		    BERKELEY_DB_LDFLAGS="-L/usr/local/lib/$v"
+		    BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
+		    BERKELEY_DB_LIB="-ldb"
+		    echo "$ac_t""OpenBSD locations" 1>&6
+		else
+		    BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
+		    BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
+		    BERKELEY_DB_LIB="-l$v"
+		    echo "$ac_t""FreeBSD locations" 1>&6
+		fi
                 break
             fi
         done
