--- squid-3.1.0.16-20100224/configure.in	2010-02-23 20:40:35.000000000 -0600
+++ squid-3.1.0.16-20100224.dlucio/configure.in	2010-02-24 11:41:47.226844697 -0600
@@ -2837,7 +2837,7 @@
 AC_SUBST(LIB_LBER)
 
 dnl Check for libdb
-DBLIB=
+LIB_DB=
 dnl 1.85
 AC_CACHE_CHECK(if dbopen needs -ldb,ac_cv_dbopen_libdb, [
 SAVED_LIBS="$LIBS"; LIBS="$LIBS -ldb"
@@ -2849,9 +2849,9 @@
 #include <limits.h>
 #endif
 #if HAVE_DB_185_H
-#include <db_185.h>
+#include <db4/db_185.h>
 #elif HAVE_DB_H
-#include <db.h>
+#include <db4/db.h>
 #endif]], [[dbopen("", 0, 0, DB_HASH, (void *)0L)]])],[ac_cv_dbopen_libdb="yes"],[ac_cv_dbopen_libdb="no"])
 LIBS="$SAVED_LIBS"
 ])
--- squid-3.1.0.16-20100224/helpers/external_acl/session/Makefile.am	2010-02-23 20:39:59.000000000 -0600
+++ squid-3.1.0.16-20100224.dlucio/helpers/external_acl/session/Makefile.am	2010-02-24 11:42:17.659822418 -0600
@@ -19,4 +19,4 @@
 
 LDADD = \
 	$(top_builddir)/compat/libcompat.la \
-	$(LIB_DB)
+	-ldb
--- squid-3.1.0.16-20100224/helpers/external_acl/session/squid_session.c	2010-02-23 20:39:59.000000000 -0600
+++ squid-3.1.0.16-20100224.dlucio/helpers/external_acl/session/squid_session.c	2010-02-24 11:42:38.659072593 -0600
@@ -43,13 +43,8 @@
 #ifndef        __BIT_TYPES_DEFINED__
 #define        __BIT_TYPES_DEFINED__
 #endif
-#if defined(HAVE_DB_185_H)
-#include <db_185.h>
-#elif defined(HAVE_DB_H)
-#include <db.h>
-#else
-#include <db_185.h>
-#endif
+
+#include <db4/db_185.h>
 
 static int session_ttl = 3600;
 char *db_path = NULL;