diff --git a/srcpkgs/tinc/files/tincd/run b/srcpkgs/tinc/files/tincd/run
new file mode 100755
index 00000000000..21f48699717
--- /dev/null
+++ b/srcpkgs/tinc/files/tincd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec tincd -D
diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 51a2c83be39..a419fbc0532 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,8 +1,10 @@
 # Template file for 'tinc'
 pkgname=tinc
 version=1.0.24
-revision=2
+revision=3
 build_style=gnu-configure
+build_options="systemd"
+replaces="runit-void<20141013_2"
 makedepends="zlib-devel lzo-devel libressl-devel"
 short_desc="VPN (Virtual Private Network) daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,5 +14,8 @@ distfiles="${homepage}/packages/${pkgname}-${version}.tar.gz"
 checksum=498e58f9f39e3922030a63cf62baf4b46a40fbda8d90b23ec0f084f4a9f9b687
 
 post_install() {
-	vinstall ${FILESDIR}/tincd@.service 644 usr/lib/systemd/system
+	vsv tincd
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/tincd@.service 644 usr/lib/systemd/system
+	fi
 }