diff --git a/srcpkgs/subversion/files/svnserve/run b/srcpkgs/subversion/files/svnserve/run
new file mode 100755
index 00000000000..6ea98d06cb9
--- /dev/null
+++ b/srcpkgs/subversion/files/svnserve/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svnserve --foreground
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index 3665a5c1811..d3f64d17fa7 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -1,7 +1,7 @@
 # Template file for 'subversion'
 pkgname=subversion
 version=1.8.10
-revision=2
+revision=3
 short_desc="Enterprise-class centralized version control for the masses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Apache-2.0, BSD"
@@ -13,23 +13,24 @@ hostmakedepends="pkg-config"
 makedepends="db-devel>=5.3 perl>=5.20 python-devel swig apr-util-devel
  libldap-devel serf-devel>=1.3.6 gdbm-devel expat-devel apr-devel libuuid-devel
  sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel
- qt-devel kdelibs-devel apache-devel ca-certificates"
+ qt-devel kdelibs-devel apache-devel"
 depends="ca-certificates"
 
+build_options="systemd"
+replaces="runit-void<20141013_2"
+
 do_configure() {
 	./configure ${configure_args} \
 		--with-apxs --disable-javahl --disable-static \
 		--with-kwallet --with-gnome-keyring --with-editor=vi \
 		--disable-mod-activation
 }
-
 do_build() {
 	make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib"
 	make ${makejobs} swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
 		swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
 		swig-py swig-pl
 }
-
 do_install() {
 	export LD_LIBRARY_PATH=${DESTDIR}/usr/lib:$LD_LIBRARY_PATH
 
@@ -38,8 +39,10 @@ do_install() {
 		swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
 		install install-swig-py install-swig-pl
 
-	vinstall ${FILESDIR}/svnserve.service 644 usr/lib/systemd/system
-	vinstall ${FILESDIR}/svnserve.tmpfiles 644 usr/lib/tmpfiles.d svnserve.conf
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/svnserve.service 644 usr/lib/systemd/system
+		vinstall ${FILESDIR}/svnserve.tmpfiles 644 usr/lib/tmpfiles.d svnserve.conf
+	fi
 
 	rm -rf ${DESTDIR}/usr/lib/perl5/core_perl
 	vmkdir usr/share/subversion
@@ -52,6 +55,8 @@ do_install() {
 	for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
 		ln -sf subversion ${DESTDIR}/usr/share/bash-completion/completions/${i}
 	done
+
+	vsv svnserve
 }
 
 libsvn_package() {
@@ -67,14 +72,12 @@ libsvn_package() {
 		vmove "usr/lib/libsvn_client*.so.*"
 	}
 }
-
 subversion-apache_package() {
 	short_desc+=" - apache httpd modules"
 	pkg_install() {
 		vmove usr/libexec
 	}
 }
-
 subversion-devel_package() {
 	depends="libsvn>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -83,7 +86,6 @@ subversion-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-
 subversion-gnome-keyring-auth_package() {
 	lib32disabled=yes
 	short_desc+=" - gnome-keyring authentication support"
@@ -91,7 +93,6 @@ subversion-gnome-keyring-auth_package() {
 		vmove "usr/lib/libsvn_auth_gnome_keyring*"
 	}
 }
-
 subversion-kwallet-auth_package() {
 	lib32disabled=yes
 	short_desc+=" - KDE kwallet authentication support"
@@ -99,7 +100,6 @@ subversion-kwallet-auth_package() {
 		vmove "usr/lib/libsvn_auth_k*"
 	}
 }
-
 subversion-python_package() {
 	lib32disabled=yes
 	depends="python"
@@ -110,7 +110,6 @@ subversion-python_package() {
 		vmove "usr/lib/python*"
 	}
 }
-
 subversion-perl_package() {
 	lib32disabled=yes
 	depends="perl>=5.16"