diff --git a/srcpkgs/rpcbind/files/rpcbind.service b/srcpkgs/rpcbind/files/rpcbind.service
index d97a13b934a..3bc764efcd9 100644
--- a/srcpkgs/rpcbind/files/rpcbind.service
+++ b/srcpkgs/rpcbind/files/rpcbind.service
@@ -1,12 +1,13 @@
 [Unit]
-Description=RPC bind service
-Requires=rpcbind.socket
-After=syslog.target network.target
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/rpcbind -w
+ExecStart=/usr/bin/rpcbind
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
-Also=rpcbind.socket
diff --git a/srcpkgs/rpcbind/files/rpcbind.socket b/srcpkgs/rpcbind/files/rpcbind.socket
deleted file mode 100644
index d63c1d97209..00000000000
--- a/srcpkgs/rpcbind/files/rpcbind.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPCbind Server Activation Socket
-
-[Socket]
-ListenStream=/var/run/rpcbind.sock
-
-[Install]
-WantedBy=sockets.target
diff --git a/srcpkgs/rpcbind/template b/srcpkgs/rpcbind/template
index c7dcc06a956..29a1fe744ec 100644
--- a/srcpkgs/rpcbind/template
+++ b/srcpkgs/rpcbind/template
@@ -1,40 +1,36 @@
 # Template file for 'rpcbind'
 pkgname=rpcbind
-version=0.2.0
-revision=6
+version=0.2.1
+revision=1
 build_style=gnu-configure
-configure_args="--enable-warmstarts --with-statedir=/var/lib/rpcbind
---with-rpcuser=rpc"
+configure_args="--enable-warmstarts --with-statedir=/run --with-rpcuser=rpc"
+hostmakedepends="pkg-config"
 makedepends="libtirpc-devel"
 short_desc="Converts RPC program numbers into universal addresses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://rpcbind.sourceforge.net"
 license="BSD"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3
+checksum=da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e
 long_desc="
  The rpcbind utility is a server that converts RPC program numbers into
  universal address. It must be running on the host to be able to make
  RPC calls on a server on that machine."
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="libtirpc-devel"
+	hostmakedepends+=" libtirpc-devel"
 fi
 
 post_install() {
 	vinstall man/rpcbind.8 644 usr/share/man/man8
 	vinstall man/rpcinfo.8 644 usr/share/man/man8
-	vmkdir usr/lib/systemd/system
-	install -m644 ${FILESDIR}/*.{service,socket} \
-		${DESTDIR}/usr/lib/systemd/system
+	vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
 }
 
 rpcbind_package() {
 	depends="shadow"
-	systemd_services="${pkgname}.socket on"
+	systemd_services="${pkgname}.service on"
 	system_accounts="rpc"
-	rpc_homedir="/var/lib/rpcbind"
-	make_dirs="/var/lib/rpcbind 0700 rpc rpc"
 	pkg_install() {
 		vmove all
 	}