diff --git a/mutt-1.5.18-db47.patch b/mutt-1.5.18-db47.patch
new file mode 100644
index 0000000..57e9e85
--- /dev/null
+++ b/mutt-1.5.18-db47.patch
@@ -0,0 +1,16 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for mutt <= 1.5.18, which
+adds the ability to link mutt against db <= 4.7 rather the original <= 4.6.
+This patch was sent upstream and hopefully should be included into the next
+release of mutt.
+
+--- mutt-1.5.18/configure		2008-07-12 20:34:15.000000000 +0200
++++ mutt-1.5.18/configure.db47		2008-07-12 20:39:52.000000000 +0200
+@@ -17397,7 +17397,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.7 db4.7 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 ''"
+         { $as_echo "$as_me:$LINENO: checking for BerkeleyDB > 4.0" >&5
+ $as_echo_n "checking for BerkeleyDB > 4.0... " >&6; }
+         for d in $bdbpfx; do
diff --git a/mutt.spec b/mutt.spec
index 175870f..6594345 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -15,7 +15,7 @@
 Summary: A text mode mail user agent
 Name: mutt
 Version: 1.5.18
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -28,6 +28,7 @@ Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
 Patch5: mutt-1.5.18-intr.patch
 Patch6: mutt-1.5.18-imap.patch
+Patch7: mutt-1.5.18-db47.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +68,7 @@ for selecting groups of messages.
 %patch4 -p1 -b .manual
 %patch5 -p1 -b .intr
 %patch6 -p1 -b .imap
+%patch7 -p1 -b .db47
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
@@ -141,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Mon Jul 28 2008 Miroslav Lichvar <mlichvar@redhat.com> 5:1.5.18-4
+- rebuild with db4.7 (Robert Scheck) (#455144)
+
 * Wed Jun 25 2008 Miroslav Lichvar <mlichvar@redhat.com> 5:1.5.18-3
 - buildrequire aspell (#452133)
 - rebuild with new gnutls