diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 39cb7fefc38..20b5108b3f1 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,19 +1,26 @@
 # Template file for 'mutt'
 pkgname=mutt
 version=1.4.2.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--enable-pop --enable-imap --with-ssl"
 homepage="http://www.mutt.org"
 distfiles="ftp://ftp.mutt.org/mutt/mutt-$version.tar.gz"
-makedepends="ncurses-devel"
 hostmakedepends="perl"
+makedepends="ncurses-devel openssl-devel"
 short_desc="The Mutt Mail Client"
 maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-2"
 checksum=1a4920e5efccd6a83932af4223cb568956158f62e9f595798acc4004aca6ace5
 
+pre_build() {
+	find -name Makefile -exec sed \
+		-e 's,-I/usr/include,,g' \
+		-e 's,${prefix}/include,,g' -i {} \;
+}
+
 mutt_package(){
 	pkg_install(){
-		vmove usr
+		vmove all
 	}
 }