diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index efafff5926..28db74da31 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,14 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.26
-revision=2
+revision=3
+patch_args="-Np1"
+build_options="systemd"
+hostmakedepends="automake libtool groff pkg-config"
+makedepends="libsasl-devel libressl-devel db-devel>=5.3 libldap-devel
+ mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
+ libmysqlclient-devel>=5.5.27"
+depends="libsasl>=${version}"
 short_desc="Cyrus SASL - auth daemon and administration tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cyrusimap.web.cmu.edu/"
@@ -9,15 +16,6 @@ license="BSD"
 distfiles="ftp://ftp.cyrusimap.org/cyrus-sasl/${pkgname}-${version}.tar.gz"
 checksum=8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
 
-hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel>=5.3
- libldap-devel mit-krb5-devel pam-devel sqlite-devel
- postgresql-libs-devel libmysqlclient-devel>=5.5.27"
-depends="libsasl>=${version}"
-
-patch_args="-Np1"
-disable_parallel_build=yes
-
 pre_configure() {
 	# XXX
 	if [ "$CROSS_BUILD" ]; then
@@ -56,11 +54,9 @@ do_configure() {
 		--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
 		--with-devrandom=/dev/urandom
 }
-
 do_build() {
 	make
 }
-
 do_install() {
 	make DESTDIR=${DESTDIR} install
 
@@ -71,11 +67,12 @@ do_install() {
 	rm ${DESTDIR}/usr/lib/pkgconfig/libsasl2.pc
 
 	# systemd
-	vinstall ${FILESDIR}/saslauthd.service 644 usr/lib/systemd/system
-	vinstall ${FILESDIR}/saslauthd.tmpfiles.d 644 \
-		usr/lib/tmpfiles.d saslauthd.conf
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/saslauthd.service 644 usr/lib/systemd/system
+		vinstall ${FILESDIR}/saslauthd.tmpfiles.d 644 usr/lib/tmpfiles.d saslauthd.conf
+	fi
 
-	vinstall COPYING 644 usr/share/licenses/${pkgname}
+	vlicense COPYING LICENSE
 }
 
 cyrus-sasl-modules-ldap_package() {
@@ -85,7 +82,6 @@ cyrus-sasl-modules-ldap_package() {
 		vmove "usr/lib/sasl2/libldapdb.*"
 	}
 }
-
 cyrus-sasl-modules-sql_package() {
 	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (SQL)"
@@ -93,7 +89,6 @@ cyrus-sasl-modules-sql_package() {
 		vmove "usr/lib/sasl2/libsql.*"
 	}
 }
-
 cyrus-sasl-modules-gssapi_package() {
 	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (GSSAPI)"
@@ -101,7 +96,6 @@ cyrus-sasl-modules-gssapi_package() {
 		vmove "usr/lib/sasl2/libgssapi*"
 	}
 }
-
 cyrus-sasl-modules_package() {
 	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules"