diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index f83af6e6f1..376fb8825f 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,14 +1,14 @@
 # Template file for 'msmtp'
 pkgname=msmtp
 version=1.4.29
-revision=1
+revision=2
 build_style=gnu-configure
+hostmakedepends="pkg-config"
+short_desc="A mini smtp client"
+maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://msmtp.sourceforge.net"
 license="GPL-3"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-makedepends="pkg-config openssl-devel gsasl-devel libgnome-keyring-devel"
-short_desc="A mini smtp client"
-maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=61f4fba0c1b299942d8f62f47a95d2713b7953d0ceba7f6cd463dd2368b93577
 long_desc="
  msmtp is an SMTP client.
@@ -30,6 +30,47 @@ long_desc="
 
 msmtp_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
+
+# Package build options
+build_options="openssl gnutls idn sasl gnome"
+desc_option_openssl="Enable support for SSL with OpenSSL"
+desc_option_gnutls="Enable support for SSL with gnutls"
+desc_option_idn="Enable support for IDN"
+desc_option_sasl="Enable support for SASL"
+desc_option_gnome="Enable support for gnome-keyring"
+
+build_options_default="openssl idn"
+
+if [ "$build_option_openssl" ]; then
+	configure_args+=" --with-ssl=openssl"
+	makedepends+=" openssl-devel"
+elif [ "$build_option_gnutls" ]; then
+	configure_args+=" --with-ssl=gnutls"
+	makedepends+=" gnutls-devel"
+else
+	configure_args+=" --with-ssl=no"
+fi
+
+if [ "$build_option_idn" ]; then
+	configure_args+=" --with-libidn"
+	makedepends+=" libidn-devel"
+else
+	configure_args+=" --without-libidn"
+fi
+
+if [ "$build_option_sasl" ]; then
+	configure_args+=" --with-libgsasl"
+	makedepends+=" gsasl-devel"
+else
+	configure_args+=" --without-libgsasl"
+fi
+
+if [ "$build_option_gnome" ]; then
+	configure_args+=" --with-gnome-keyring"
+	makedepends+=" libgnome-keyring-devel"
+else
+	configure_args+=" --without-gnome-keyring"
+fi