diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	2009-12-30 06:10:05.000000000 +0100
+++ ./Makefile	2010-01-27 18:21:46.000000000 +0100
@@ -297,9 +297,6 @@
 .if defined(WITH_MUTT_CYRUS_SASL2)
 LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 .endif
-.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
-USE_BDB=	42+
-.endif
 .if exists(${LOCALBASE}/lib/libidn.so) && !defined(WITHOUT_MUTT_IDN)
 WITH_MUTT_IDN=	yes
 .endif
@@ -489,7 +486,9 @@
 .if defined(WITH_MUTT_IMAP_HEADER_CACHE)
 .if defined(WITH_TOKYOCABINET)
 CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --without-bdb --with-tokyocabinet
+LIB_DEPENDS+=		tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
 .else
+USE_BDB=		42+
 CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --with-bdb
 .endif
 .else
diff -ru  /usr/ports/mail/mutt-devel/files/patch-bdb ./files/patch-bdb
--- /usr/ports/mail/mutt-devel/files/patch-bdb	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-bdb	2010-01-27 18:15:51.000000000 +0100
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2009-06-09 08:50:33.000000000 +0200
++++ configure.ac	2010-01-27 18:15:31.000000000 +0100
+@@ -976,7 +976,7 @@
+                 bdbpfx="$bdbpfx $d/$v"
+             done
+         done
+-        BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
++        BDB_VERSIONS="db-4 db4 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
+         AC_MSG_CHECKING([for BerkeleyDB > 4.0])
+         for d in $bdbpfx; do
+             BDB_INCLUDE_DIR=""