diff -u mutt-1.5.20/debian/changelog mutt-1.5.20/debian/changelog
--- mutt-1.5.20/debian/changelog
+++ mutt-1.5.20/debian/changelog
@@ -1,3 +1,10 @@
+mutt (1.5.20-9ubuntu2) maverick; urgency=low
+
+  * Drop libtokyocabinet-dev (universe) from Build-Depends, use always
+    libgdbm-dev and also use gdbm for the header cache backend. (lp: #607448)
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 19 Jul 2010 22:42:16 +0200
+
 mutt (1.5.20-9ubuntu1) maverick; urgency=low
 
   * Merge with Debian (LP: #588736). Remaining changes:
diff -u mutt-1.5.20/debian/control mutt-1.5.20/debian/control
--- mutt-1.5.20/debian/control
+++ mutt-1.5.20/debian/control
@@ -8,7 +8,7 @@
  w3m, gawk, gettext, libgnutls-dev,
  libgpgme11-dev, libidn11-dev, libkrb5-dev, libncurses5-dev, libncursesw5-dev,
  libsasl2-dev, pkg-config, quilt, xsltproc, zlib1g-dev,
- libtokyocabinet-dev [!hurd-i386], libgdbm-dev [hurd-i386]
+ libgdbm-dev
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-mutt/mutt.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mutt/mutt.git
diff -u mutt-1.5.20/debian/rules mutt-1.5.20/debian/rules
--- mutt-1.5.20/debian/rules
+++ mutt-1.5.20/debian/rules
@@ -11,9 +11,9 @@
 ###
 # header cache backend
 # HCACHE_DB := bdb
-# HCACHE_DB := gdbm
+HCACHE_DB := gdbm
 # HCACHE_DB := qdbm
-HCACHE_DB := tokyocabinet
+# HCACHE_DB := tokyocabinet
 ###
 # GPGME backend
 GPGME := --enable-gpgme