diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 5c8fe943ee43..d215ba3adbe6 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.11 1996/12/08 06:33:38 obrien Exp $
+# $Id: Makefile,v 1.12 1996/12/18 05:06:26 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.54
+PKGNAME=	mutt-0.55
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,20 +20,9 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
 		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
-PATCHFILES=	02.control.PATCH  \
-		03.fileio.PATCH  \
-		04.parse.PATCH  \
-		05.url.PATCH  \
-		06.init.PATCH  \
-		08.dirlist.PATCH  \
-		09.complete.PATCH  \
-		10.prefix.PATCH  \
-		11.batchmode.PATCH  \
-		12.folderrecog.PATCH  \
-		14.savename.PATCH  \
-		15.postponed.PATCH
-#		don't apply cleanly:
-#		13.pagercontext.PATCH  \
+PATCHFILES=	02.externally.PATCH  \
+		03.ispell.PATCH  \
+		04.savename.PATCH
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 80306b3b1239..70a35a17a143 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,13 +1,4 @@
-MD5 (mutt/mutt-0.54-export.tar.gz) = 277c98bdd34fd1f79d05fbf368e4e6f1
-MD5 (mutt/02.control.PATCH) = d46cd4dc4cf9393b64bfe922798962f6
-MD5 (mutt/03.fileio.PATCH) = f075e4c04e7407ccb1381e966c448294
-MD5 (mutt/04.parse.PATCH) = 69be0343eaf392ef9b6a099b101461cc
-MD5 (mutt/05.url.PATCH) = b246fa011a4222339ba31735a05d0275
-MD5 (mutt/06.init.PATCH) = e0c40c07288ebba5e30b50184f066afc
-MD5 (mutt/08.dirlist.PATCH) = 30b4b1c0f6fa7b3495168079ccb37134
-MD5 (mutt/09.complete.PATCH) = 1343cb8a14439d9395f0e03546c9af59
-MD5 (mutt/10.prefix.PATCH) = d5899185b2af7e970e93115e03d22efb
-MD5 (mutt/11.batchmode.PATCH) = 7454be03b2d38ecf7c46480ec920459e
-MD5 (mutt/12.folderrecog.PATCH) = 06948632141c3b972a71c629cac394b7
-MD5 (mutt/14.savename.PATCH) = 1e17cb71464abb1b1b4ecefd45258030
-MD5 (mutt/15.postponed.PATCH) = 03b09d8a1e48ef61ec6d04c18af80ca4
+MD5 (mutt-0.55-export.tar.gz) = 8dbde302a3bb4182d54471cc5641ee48
+MD5 (02.externally.PATCH) = 2c3ebeb012d58f3d59830e3a5e0db10c
+MD5 (03.ispell.PATCH) = f1ea0cbd02ab023eec47f8b31f39a87f
+MD5 (04.savename.PATCH) = a2d267248e444d6297e1660f45700e8a
diff --git a/mail/mutt-devel/files/patch-01 b/mail/mutt-devel/files/patch-01
deleted file mode 100644
index cb0f0416ea6e..000000000000
--- a/mail/mutt-devel/files/patch-01
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Dec 18 02:48:06 1996
-+++ configure	Wed Dec 18 02:54:07 1996
-@@ -751,7 +751,7 @@
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib; do
-+  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib /usr/sbin; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index b63dcc356ed9..c6efc36c2548 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -4,3 +4,4 @@ share/misc/Muttrc
 share/misc/mime.types
 share/doc/mutt/makefile
 share/doc/mutt/manual.sgml
+share/doc/mutt/manual.txt
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 5c8fe943ee43..d215ba3adbe6 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.11 1996/12/08 06:33:38 obrien Exp $
+# $Id: Makefile,v 1.12 1996/12/18 05:06:26 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.54
+PKGNAME=	mutt-0.55
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,20 +20,9 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
 		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
-PATCHFILES=	02.control.PATCH  \
-		03.fileio.PATCH  \
-		04.parse.PATCH  \
-		05.url.PATCH  \
-		06.init.PATCH  \
-		08.dirlist.PATCH  \
-		09.complete.PATCH  \
-		10.prefix.PATCH  \
-		11.batchmode.PATCH  \
-		12.folderrecog.PATCH  \
-		14.savename.PATCH  \
-		15.postponed.PATCH
-#		don't apply cleanly:
-#		13.pagercontext.PATCH  \
+PATCHFILES=	02.externally.PATCH  \
+		03.ispell.PATCH  \
+		04.savename.PATCH
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 80306b3b1239..70a35a17a143 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,13 +1,4 @@
-MD5 (mutt/mutt-0.54-export.tar.gz) = 277c98bdd34fd1f79d05fbf368e4e6f1
-MD5 (mutt/02.control.PATCH) = d46cd4dc4cf9393b64bfe922798962f6
-MD5 (mutt/03.fileio.PATCH) = f075e4c04e7407ccb1381e966c448294
-MD5 (mutt/04.parse.PATCH) = 69be0343eaf392ef9b6a099b101461cc
-MD5 (mutt/05.url.PATCH) = b246fa011a4222339ba31735a05d0275
-MD5 (mutt/06.init.PATCH) = e0c40c07288ebba5e30b50184f066afc
-MD5 (mutt/08.dirlist.PATCH) = 30b4b1c0f6fa7b3495168079ccb37134
-MD5 (mutt/09.complete.PATCH) = 1343cb8a14439d9395f0e03546c9af59
-MD5 (mutt/10.prefix.PATCH) = d5899185b2af7e970e93115e03d22efb
-MD5 (mutt/11.batchmode.PATCH) = 7454be03b2d38ecf7c46480ec920459e
-MD5 (mutt/12.folderrecog.PATCH) = 06948632141c3b972a71c629cac394b7
-MD5 (mutt/14.savename.PATCH) = 1e17cb71464abb1b1b4ecefd45258030
-MD5 (mutt/15.postponed.PATCH) = 03b09d8a1e48ef61ec6d04c18af80ca4
+MD5 (mutt-0.55-export.tar.gz) = 8dbde302a3bb4182d54471cc5641ee48
+MD5 (02.externally.PATCH) = 2c3ebeb012d58f3d59830e3a5e0db10c
+MD5 (03.ispell.PATCH) = f1ea0cbd02ab023eec47f8b31f39a87f
+MD5 (04.savename.PATCH) = a2d267248e444d6297e1660f45700e8a
diff --git a/mail/mutt/files/patch-01 b/mail/mutt/files/patch-01
deleted file mode 100644
index cb0f0416ea6e..000000000000
--- a/mail/mutt/files/patch-01
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Dec 18 02:48:06 1996
-+++ configure	Wed Dec 18 02:54:07 1996
-@@ -751,7 +751,7 @@
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib; do
-+  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib /usr/sbin; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index b63dcc356ed9..c6efc36c2548 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -4,3 +4,4 @@ share/misc/Muttrc
 share/misc/mime.types
 share/doc/mutt/makefile
 share/doc/mutt/manual.sgml
+share/doc/mutt/manual.txt
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 5c8fe943ee43..d215ba3adbe6 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.11 1996/12/08 06:33:38 obrien Exp $
+# $Id: Makefile,v 1.12 1996/12/18 05:06:26 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
-PKGNAME=	mutt-0.54
+PKGNAME=	mutt-0.55
 CATEGORIES=	mail
 MASTER_SITES=	ftp://cs.hmc.edu/pub/me/mutt/  \
 		ftp://ftp.ibp.fr/pub/unix/mail/mutt/  \
@@ -20,20 +20,9 @@ PATCH_SITES=	ftp://nuxi.cs.ucdavis.edu/pub/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
 		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
 		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/
-PATCHFILES=	02.control.PATCH  \
-		03.fileio.PATCH  \
-		04.parse.PATCH  \
-		05.url.PATCH  \
-		06.init.PATCH  \
-		08.dirlist.PATCH  \
-		09.complete.PATCH  \
-		10.prefix.PATCH  \
-		11.batchmode.PATCH  \
-		12.folderrecog.PATCH  \
-		14.savename.PATCH  \
-		15.postponed.PATCH
-#		don't apply cleanly:
-#		13.pagercontext.PATCH  \
+PATCHFILES=	02.externally.PATCH  \
+		03.ispell.PATCH  \
+		04.savename.PATCH
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index 80306b3b1239..70a35a17a143 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1,13 +1,4 @@
-MD5 (mutt/mutt-0.54-export.tar.gz) = 277c98bdd34fd1f79d05fbf368e4e6f1
-MD5 (mutt/02.control.PATCH) = d46cd4dc4cf9393b64bfe922798962f6
-MD5 (mutt/03.fileio.PATCH) = f075e4c04e7407ccb1381e966c448294
-MD5 (mutt/04.parse.PATCH) = 69be0343eaf392ef9b6a099b101461cc
-MD5 (mutt/05.url.PATCH) = b246fa011a4222339ba31735a05d0275
-MD5 (mutt/06.init.PATCH) = e0c40c07288ebba5e30b50184f066afc
-MD5 (mutt/08.dirlist.PATCH) = 30b4b1c0f6fa7b3495168079ccb37134
-MD5 (mutt/09.complete.PATCH) = 1343cb8a14439d9395f0e03546c9af59
-MD5 (mutt/10.prefix.PATCH) = d5899185b2af7e970e93115e03d22efb
-MD5 (mutt/11.batchmode.PATCH) = 7454be03b2d38ecf7c46480ec920459e
-MD5 (mutt/12.folderrecog.PATCH) = 06948632141c3b972a71c629cac394b7
-MD5 (mutt/14.savename.PATCH) = 1e17cb71464abb1b1b4ecefd45258030
-MD5 (mutt/15.postponed.PATCH) = 03b09d8a1e48ef61ec6d04c18af80ca4
+MD5 (mutt-0.55-export.tar.gz) = 8dbde302a3bb4182d54471cc5641ee48
+MD5 (02.externally.PATCH) = 2c3ebeb012d58f3d59830e3a5e0db10c
+MD5 (03.ispell.PATCH) = f1ea0cbd02ab023eec47f8b31f39a87f
+MD5 (04.savename.PATCH) = a2d267248e444d6297e1660f45700e8a
diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01
deleted file mode 100644
index cb0f0416ea6e..000000000000
--- a/mail/mutt14/files/patch-01
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Dec 18 02:48:06 1996
-+++ configure	Wed Dec 18 02:54:07 1996
-@@ -751,7 +751,7 @@
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib; do
-+  for ac_dir in `echo $PATH | sed "s/:/ /"` /usr/lib /usr/sbin; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index b63dcc356ed9..c6efc36c2548 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -4,3 +4,4 @@ share/misc/Muttrc
 share/misc/mime.types
 share/doc/mutt/makefile
 share/doc/mutt/manual.sgml
+share/doc/mutt/manual.txt