Index: Makefile
===================================================================
--- Makefile	(revision 426133)
+++ Makefile	(working copy)
@@ -26,13 +26,16 @@
 OPTIONS_DEFINE=	NLS DOCS SASL ICONV IDN FLOCK GPGME NOTMUCH
 OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME
 OPTIONS_RADIO=	HCACHE
-OPTIONS_RADIO_HCACHE=	TOKYOCABINET LMDB
+OPTIONS_RADIO_HCACHE=	BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
 
 FLOCK_DESC=	Use flock() to lock files
 GPGME_DESC=	Use gpgme to handle pgp
 NOTMUCH_DESC=	Use notmuch for tagging and searching
-TOKYOCABINET_DESC=	Use TokyoCabinet as header-cache backend
-LMDB_DESC=		Use LMDB as header-cache backend
+HCACHE_DESC=	Header-cache backend
+KYOTOCABINET_DESC=	Kyoto Cabinet support
+LMDB_DESC=		Lightning Memory-Mapped Database support
+QDBM_DESC=		Quick DataBase Manager support
+TOKYOCABINET_DESC=	Tokyo Cabinet support
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-docdir="${DOCSDIR}" \
@@ -44,16 +47,23 @@
 		--enable-compressed \
 		--enable-hcache \
 		--enable-sidebar \
-		--without-qdbm \
 		--disable-fcntl \
 		--enable-external-dotlock
 
+# Header cache
+BDB_CONFIGURE_WITH=		bdb
+BDB_USES=			bdb
+GDBM_CONFIGURE_WITH=		gdbm
+GDBM_LIB_DEPENDS=		libgdbm.so:databases/gdbm
+KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet
+KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
+LMDB_CONFIGURE_WITH=		lmdb
+LMDB_LIB_DEPENDS=		liblmdb.so:databases/lmdb
+QDBM_CONFIGURE_WITH=		qdbm
+QDBM_LIB_DEPENDS=		libqdbm.so:databases/qdbm
 TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
 TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
-LMDB_CONFIGURE_WITH=	lmdb
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
-
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 NLS_IMPLIES=	ICONV