diff --git a/srcpkgs/rpcbind/files/rpcbind.service b/srcpkgs/rpcbind/files/rpcbind.service
deleted file mode 100644
index 3bc764efcd9..00000000000
--- a/srcpkgs/rpcbind/files/rpcbind.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC Bind
-After=network.target
-Wants=rpcbind.target
-Before=rpcbind.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/rpcbind
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/rpcbind/template b/srcpkgs/rpcbind/template
index 544f1f45408..e85eeece203 100644
--- a/srcpkgs/rpcbind/template
+++ b/srcpkgs/rpcbind/template
@@ -1,9 +1,10 @@
 # Template file for 'rpcbind'
 pkgname=rpcbind
-version=0.2.1
-revision=4
+version=0.2.2
+revision=1
 build_style=gnu-configure
-configure_args="--enable-warmstarts --with-statedir=/run --with-rpcuser=rpc"
+configure_args="--enable-warmstarts --with-statedir=/run --with-rpcuser=rpc
+ $(vopt_if systemd '--with-systemsystemunitdir=/usr/lib/systemd/system' '--with-systemdsystemunitdir=no')"
 hostmakedepends="pkg-config"
 makedepends="libtirpc-devel"
 short_desc="Converts RPC program numbers into universal addresses"
@@ -11,17 +12,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://rpcbind.sourceforge.net"
 license="BSD"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e
+checksum=13dbc8c796dbe0ce8df873007bea0490c8460b56202d918c9eb6fa0358a08f29
 
 build_options="systemd"
 system_accounts="rpc"
-replaces="runit-void<20141013_2"
 
 post_install() {
 	vsv rpcbind
-	vinstall man/rpcbind.8 644 usr/share/man/man8
-	vinstall man/rpcinfo.8 644 usr/share/man/man8
-	if [ "$build_option_systemd" ]; then
-		vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
-	fi
+	vman man/rpcbind.8
+	vman man/rpcinfo.8
 }