diff --git a/srcpkgs/thttpd/files/thttpd/run b/srcpkgs/thttpd/files/thttpd/run
new file mode 100755
index 00000000000..95a629aabe2
--- /dev/null
+++ b/srcpkgs/thttpd/files/thttpd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec thttpd -D
diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
index b0547b935f5..2de6e71b12e 100644
--- a/srcpkgs/thttpd/template
+++ b/srcpkgs/thttpd/template
@@ -1,7 +1,8 @@
 # Template file for 'thttpd'
 pkgname=thttpd
 version=2.26
-revision=1
+revision=2
+replaces="runit-void<20141013_2"
 build_style=gnu-configure
 short_desc="Tiny/turbo/throttling HTTP server"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,7 +12,7 @@ distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz"
 checksum=15b3f6c60f854061e333227e9ea9ff789d34a092c9365690a8c0d3ecfc85cbb7
 
 pre_configure() {
-	sed -e "s,-o bin -g bin,,g" -i Makefile.in
+	sed "s,-o bin -g bin,,g" -i Makefile.in
 }
 pre_build() {
 	export LD=$CC
@@ -21,13 +22,14 @@ do_install() {
 	vmkdir usr/share/man/man1
 	vmkdir usr/share/man/man8
 
-	make WEBGROUP=root \
+	make WEBGROUP=$(whoami) \
 		WEBDIR=${DESTDIR}/usr/share/thttpd \
 		BINDIR=${DESTDIR}/usr/bin \
 		MANDIR=${DESTDIR}/usr/share/man install
 
+	vsv thttpd
+
 	# Rename htpasswd to not conflict with apache.
-	mv ${DESTDIR}/usr/bin/htpasswd ${DESTDIR}/usr/bin/thttpd-htpasswd
-	mv ${DESTDIR}/usr/share/man/man1/htpasswd.1 \
-		${DESTDIR}/usr/share/man/man1/thttpd-htpasswd.1
+	mv ${DESTDIR}/usr/bin/{htpasswd,thttpd-htpasswd}
+	mv ${DESTDIR}/usr/share/man/man1/{htpasswd,thttpd-htpasswd}.1
 }