diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 325a13ffe29..d431bd31961 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
-version=1.6.0
-revision=3
+version=1.6.1
+revision=1
 makedepends="pcre-devel>=8.30 libressl-devel"
 if [ "$CROSS_BUILD" ]; then
 	# fake configure run on host
@@ -19,7 +19,6 @@ conf_files="
 	/etc/nginx/win-utf"
 system_accounts="nginx"
 nginx_homedir="/var/tmp/nginx"
-systemd_services="nginx.service on"
 make_dirs="
 	/var/log/nginx 0750 root root
 	/var/tmp 1777 root root
@@ -29,7 +28,12 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="Simplified BSD"
 homepage="http://nginx.org"
 distfiles="http://nginx.org/download/nginx-$version.tar.gz"
-checksum=943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a
+checksum=f5cfe682a1aeef4602c2ca705402d5049b748f946563f41d8256c18674836067
+
+build_options="systemd"
+if [ "$build_option_systemd" ]; then
+	systemd_services="nginx.service on"
+fi
 
 do_configure() {
 	local cfgdir=/etc/nginx
@@ -86,6 +90,8 @@ do_install() {
 	vmkdir usr/share/nginx
 	mv $DESTDIR/etc/nginx/html/ $DESTDIR/usr/share/nginx
 
-	vinstall ${FILESDIR}/nginx.service 644 usr/lib/systemd/system
 	vinstall LICENSE 644 usr/share/licenses/nginx
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/nginx.service 644 usr/lib/systemd/system
+	fi
 }