diff --git a/srcpkgs/xinetd/files/xinetd/run b/srcpkgs/xinetd/files/xinetd/run
new file mode 100755
index 00000000000..6ecb920ea84
--- /dev/null
+++ b/srcpkgs/xinetd/files/xinetd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec xinetd -dontfork
diff --git a/srcpkgs/xinetd/template b/srcpkgs/xinetd/template
index 9eef98c35c8..42ccd0ec4d9 100644
--- a/srcpkgs/xinetd/template
+++ b/srcpkgs/xinetd/template
@@ -1,7 +1,7 @@
 # Template file for 'xinetd'
 pkgname=xinetd
 version=2.3.15
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-libwrap"
 short_desc="A secure replacement for inetd"
@@ -12,12 +12,14 @@ distfiles="http://ponce.cc/slackware/sources/repo/xinetd-${version}.tar.gz"
 checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
 
 conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services"
+replaces="runit-void<20141013_2"
 
 do_install() {
 	make prefix=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install
 
-	vinstall ${FILESDIR}/xinetd.conf 644 etc
+	vconf ${FILESDIR}/xinetd.conf
 	vinstall ${FILESDIR}/servers 644 etc/xinetd.d
 	vinstall ${FILESDIR}/services 644 etc/xinetd.d
-	vinstall COPYRIGHT 644 usr/share/licenses/$pkgname
+	vlicense COPYRIGHT
+	vsv xinetd
 }