diff --git a/srcpkgs/ngircd/files/ngircd/run b/srcpkgs/ngircd/files/ngircd/run
new file mode 100755
index 00000000000..253a0cdd3e7
--- /dev/null
+++ b/srcpkgs/ngircd/files/ngircd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec ngircd -n
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index b0541448b94..f3c4b143792 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,8 +1,10 @@
 # Template build file for 'ngircd'
 pkgname=ngircd
 version=21.1
-revision=3
+revision=4
 build_style=gnu-configure
+build_options="systemd"
+replaces="runit-void<20141013_2"
 configure_args="--enable-ipv6 --with-openssl --without-ident"
 hostmakedepends="pkg-config"
 makedepends="zlib-devel libressl-devel"
@@ -18,5 +20,8 @@ post_configure() {
 	echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h
 }
 post_install() {
-	vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
+	vsv ngircd
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
+	fi
 }