diff --git a/mail/mutt/Makefile.inc b/mail/mutt/Makefile.inc
index 2b0d4cea6c8..f879198ddb4 100644
--- a/mail/mutt/Makefile.inc
+++ b/mail/mutt/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2005/02/07 20:47:56 naddy Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2005/03/06 01:44:20 sturm Exp $
 
 DISTNAME=	mutt-${VERSION}i
 CATEGORIES=	mail
@@ -68,12 +68,12 @@ RUN_DEPENDS+=		::mail/mixmaster
 .endif
 
 .if ${FLAVOR:L:Mhcache}
-PATCHFILES+=		patch-1.5.7.tg.hcache.1:1
+PATCHFILES+=		mutt-cvs-header-cache.29:1
 PATCH_DIST_STRIP=	-p1
 CONFIGURE_ARGS+=	--enable-hcache
 LIB_DEPENDS+=		gdbm.2::databases/gdbm
 .else
-SUPDISTFILES+=		patch-1.5.7.tg.hcache.1:1
+SUPDISTFILES+=		mutt-cvs-header-cache.29:1
 CONFIGURE_ARGS+=	--without-gdbm
 .endif
 
diff --git a/mail/mutt/snapshot/Makefile b/mail/mutt/snapshot/Makefile
index 0e63030c704..ba1f8a7338d 100644
--- a/mail/mutt/snapshot/Makefile
+++ b/mail/mutt/snapshot/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.31 2005/02/07 17:16:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.32 2005/03/06 01:44:20 sturm Exp $
 
 COMMENT=	"tty-based e-mail client, development version"
 
-VERSION=	1.5.7
+VERSION=	1.5.8
 MASTER_SITES=	${MASTER_SITES_MUTT:=devel/}
 
 AUTOCONF_VERSION= 2.59
diff --git a/mail/mutt/snapshot/distinfo b/mail/mutt/snapshot/distinfo
index 33afbc5e5a1..6fa2affa164 100644
--- a/mail/mutt/snapshot/distinfo
+++ b/mail/mutt/snapshot/distinfo
@@ -1,12 +1,12 @@
-MD5 (mutt-1.5.7i.tar.gz) = 395c699f1d00ee193f8f145b82d6afb7
-MD5 (patch-1.5.7.rr.compressed.1.gz) = d001ab9fe475063a9d640a75f8dbbad5
-MD5 (patch-1.5.7.tg.hcache.1) = d9d138a8634d1f7481489fb54653b068
-RMD160 (mutt-1.5.7i.tar.gz) = 71e5c5e62f719d3f4bedf171ada0a034391e7d21
-RMD160 (patch-1.5.7.rr.compressed.1.gz) = afdc9d3da54e5b1da0c610c35061a72d928251d6
-RMD160 (patch-1.5.7.tg.hcache.1) = 57b16f9a0558e9f9ac710807a6112633fceb4328
-SHA1 (mutt-1.5.7i.tar.gz) = 0edc7eb245b6dd9c6c22f850acd6ebdb3151ed28
-SHA1 (patch-1.5.7.rr.compressed.1.gz) = 3a4ee508e79ad47ac894204ede72b55bc4287e1e
-SHA1 (patch-1.5.7.tg.hcache.1) = aaf0c7fcce324ef7dfb15d49c6ff8f2fd09d02c7
-SIZE (mutt-1.5.7i.tar.gz) = 2990425
-SIZE (patch-1.5.7.rr.compressed.1.gz) = 13770
-SIZE (patch-1.5.7.tg.hcache.1) = 5976
+MD5 (mutt-1.5.8i.tar.gz) = 9b9bdef4ef7107332f8782b3a910d00e
+MD5 (mutt-cvs-header-cache.29) = 8bd12eb073ef94712f3a88eb8493f195
+MD5 (patch-1.5.8.rr.compressed.1.gz) = a45bd30996f98ba725bf479111cc9579
+RMD160 (mutt-1.5.8i.tar.gz) = 2b941aa12381efb2cbad204ebf5512051909911b
+RMD160 (mutt-cvs-header-cache.29) = b9c84cdc699ca8b053cc1b39cbccb225b5701749
+RMD160 (patch-1.5.8.rr.compressed.1.gz) = 4eb2009b2667c9493e2d518b643170106065aa77
+SHA1 (mutt-1.5.8i.tar.gz) = d5381676b7bfb4ebee5d5261e5236d88414c2bd2
+SHA1 (mutt-cvs-header-cache.29) = 4c952f75df9ce662e99e68f72934b3a1d3b0e1eb
+SHA1 (patch-1.5.8.rr.compressed.1.gz) = a9465ce4d21e32fd861c1cb8f325f0100cf0fa78
+SIZE (mutt-1.5.8i.tar.gz) = 3010088
+SIZE (mutt-cvs-header-cache.29) = 5120
+SIZE (patch-1.5.8.rr.compressed.1.gz) = 13728
diff --git a/mail/mutt/stable/distinfo b/mail/mutt/stable/distinfo
index 8b55e358ed1..128500b6e7d 100644
--- a/mail/mutt/stable/distinfo
+++ b/mail/mutt/stable/distinfo
@@ -1,12 +1,12 @@
 MD5 (mutt-1.4.2i.tar.gz) = 6045b47cbba8170d6a9fdccc1aa817b9
+MD5 (mutt-cvs-header-cache.29) = 8bd12eb073ef94712f3a88eb8493f195
 MD5 (patch-1.4.2.rr.compressed.1.gz) = 36381ca7ff377a0d79c23b89e8388171
-MD5 (patch-1.5.7.tg.hcache.1) = d9d138a8634d1f7481489fb54653b068
 RMD160 (mutt-1.4.2i.tar.gz) = c44ceb3f29144468d111451c1b7402240ed9450e
+RMD160 (mutt-cvs-header-cache.29) = b9c84cdc699ca8b053cc1b39cbccb225b5701749
 RMD160 (patch-1.4.2.rr.compressed.1.gz) = d99566ea664bde7f5f19f4686638a728e04c3ee8
-RMD160 (patch-1.5.7.tg.hcache.1) = 57b16f9a0558e9f9ac710807a6112633fceb4328
 SHA1 (mutt-1.4.2i.tar.gz) = 2c5859bf0400f4a23c3b49f4ceb1c9e16b2c5462
+SHA1 (mutt-cvs-header-cache.29) = 4c952f75df9ce662e99e68f72934b3a1d3b0e1eb
 SHA1 (patch-1.4.2.rr.compressed.1.gz) = e39fb088a899b4585ed5393877fb8654e5d943b6
-SHA1 (patch-1.5.7.tg.hcache.1) = aaf0c7fcce324ef7dfb15d49c6ff8f2fd09d02c7
 SIZE (mutt-1.4.2i.tar.gz) = 2557481
+SIZE (mutt-cvs-header-cache.29) = 5120
 SIZE (patch-1.4.2.rr.compressed.1.gz) = 14065
-SIZE (patch-1.5.7.tg.hcache.1) = 5976