diff --git a/mail-client/mutt/mutt-1.8.0.recipe b/mail-client/mutt/mutt-1.8.1.recipe
similarity index 92%
rename from mail-client/mutt/mutt-1.8.0.recipe
rename to mail-client/mutt/mutt-1.8.1.recipe
index 8b701984a..0b78dde15 100644
--- a/mail-client/mutt/mutt-1.8.0.recipe
+++ b/mail-client/mutt/mutt-1.8.1.recipe
@@ -14,7 +14,7 @@ COPYRIGHT="1996-2016 Michael R. Elkins
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://bitbucket.org/mutt/mutt/downloads/mutt-$portVersion.tar.gz"
-CHECKSUM_SHA256="45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab"
+CHECKSUM_SHA256="0be55a8cae6db2ef7ce831a70cbf6b2d8a0de558a08814933a67855ef07b0dad"
 PATCHES="mutt-$portVersion.patchset"
 
 ARCHITECTURES="?x86_gcc2 x86 x86_64"
@@ -31,7 +31,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	cmd:gpg$secondaryArchSuffix
+	cmd:gpg2$secondaryArchSuffix
 	lib:libaspell$secondaryArchSuffix
 	lib:libassuan$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -69,8 +69,7 @@ BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:gawk
 	cmd:gcc$secondaryArchSuffix
-	cmd:gpg$secondaryArchSuffix
-	cmd:gpgme_config$secondaryArchSuffix
+	cmd:gpg2$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:m4
@@ -103,7 +102,7 @@ BUILD()
 		--with-idn \
 		--with-regex \
 		--with-ssl \
-		--with-mailpath=/boot/home/mail/mutt
+		--with-mailpath=`finddir B_USER_DIRECTORY`/mail/mutt
 
 	make $jobArgs
 }
diff --git a/mail-client/mutt/patches/mutt-1.8.0.patchset b/mail-client/mutt/patches/mutt-1.8.1.patchset
similarity index 100%
rename from mail-client/mutt/patches/mutt-1.8.0.patchset
rename to mail-client/mutt/patches/mutt-1.8.1.patchset