diff --git a/mail-client/mutt/mutt-1.14.6.recipe b/mail-client/mutt/mutt-2.2.13.recipe
similarity index 76%
rename from mail-client/mutt/mutt-1.14.6.recipe
rename to mail-client/mutt/mutt-2.2.13.recipe
index fcdebf599..6dd7fb4df 100644
--- a/mail-client/mutt/mutt-1.14.6.recipe
+++ b/mail-client/mutt/mutt-2.2.13.recipe
@@ -1,23 +1,25 @@
 SUMMARY="Small but very powerful text-based mail client"
-DESCRIPTION="A text-based email client for Unix-like systems. \
-The Mutt slogan is All mail clients suck. This one just sucks less."
+DESCRIPTION="Mutt is a small but very powerful text-based MIME mail client. Mutt is highly \
+configurable, and is well suited to the mail power user with advanced features like key bindings, \
+keyboard macros, mail threading, regular expression searches and a powerful pattern matching \
+language for selecting groups of messages."
 HOMEPAGE="http://www.mutt.org/"
 COPYRIGHT="1996-2016 Michael R. Elkins
 	1996-2002 Brandon Long
 	1997-2009 Thomas Roessler
 	1998-2005 Werner Koch
-	1999-2014 Brendan Cully
+	1999-2017 Brendan Cully
 	1999-2002 Tommi Komulainen
 	2000-2004 Edmund Grimley Evans
+	2000-2019 David Champion
 	2006-2009 Rocco Rutte
-	2014-2018 Kevin J. McCarthy"
+	2014-2023 Kevin J. McCarthy"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://bitbucket.org/mutt/mutt/downloads/mutt-$portVersion.tar.gz"
-CHECKSUM_SHA256="47972a0152b81b9f67ff322a0a6682b914c15545bfdeac6bcc2f2c0bf9361844"
-PATCHES="mutt-$portVersion.patchset"
+CHECKSUM_SHA256="eb23faddc1cc97d867693f3a4a9f30949ad93765ad5b6fdae2797a4001c58efb"
 
-ARCHITECTURES="all ?x86_gcc2"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 commandBinDir=$binDir
@@ -51,7 +53,6 @@ REQUIRES="
 	lib:libidn$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
-#	lib:libsasl2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -68,27 +69,21 @@ BUILD_REQUIRES="
 	devel:libidn$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix
-#	devel:libsasl2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	cmd:autoreconf
-	cmd:awk
 	cmd:bison
 	cmd:gawk
 	cmd:gcc$secondaryArchSuffix
 	cmd:gpg$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:m4
+	cmd:perl
 	"
 
 GLOBAL_WRITABLE_FILES="
 	settings/Muttrc keep-old
-	settings/Muttrc.dist keep-old
 	settings/mime.types keep-old
-	settings/mime.types.dist keep-old
 	"
 
 defineDebugInfoPackage mutt$secondaryArchSuffix \
@@ -101,10 +96,8 @@ BUILD()
 	export CFLAGS="-D_BSD_SOURCE"
 	export LDFLAGS="-lnetwork -lbsd"
 
-	libtoolize --force --copy --install
-	autoreconf -vfi
-
-	runConfigure --omit-dirs "binDir" configure \
+	SENDMAIL=/bin/sendmail \
+	runConfigure --omit-dirs "binDir" ./configure \
 		--enable-compressed \
 		--enable-gpgme \
 		--enable-imap \
@@ -114,9 +107,9 @@ BUILD()
 		--disable-warnings \
 		--with-gnutls \
 		--with-idn \
-		--with-regex \
+		--with-bundled-regex \
 		--with-ssl \
-		--with-mailpath=`finddir B_USER_DIRECTORY`/mail/mutt \
+		--with-mailpath=$localStateDir/mail \
 		--bindir=$commandBinDir
 
 	make $jobArgs
@@ -125,4 +118,7 @@ BUILD()
 INSTALL()
 {
 	make install
+
+	# no need for an extra copy of these files
+	rm -fv $settingsDir/{Muttrc,mime.types}.dist
 }