diff --git a/srcpkgs/shorewall/files/shorewall/finish b/srcpkgs/shorewall/files/shorewall/finish
new file mode 100755
index 0000000000..1f23ab2f4e
--- /dev/null
+++ b/srcpkgs/shorewall/files/shorewall/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+exec shorewall stop
diff --git a/srcpkgs/shorewall/files/shorewall/run b/srcpkgs/shorewall/files/shorewall/run
new file mode 100755
index 0000000000..751bf5b76b
--- /dev/null
+++ b/srcpkgs/shorewall/files/shorewall/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+shorewall start
+exec chpst -b shorewall pause
diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 9b2db3ce36..9a65bda735 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,7 +1,7 @@
 # Template file for 'shorewall'
 pkgname=shorewall
 version=4.6.3.2
-revision=1
+revision=2
 _disturl="http://www.shorewall.net/pub/${pkgname}/4.6/${pkgname}-4.6.3"
 distfiles="
  ${_disturl}/${pkgname}-${version}.tar.bz2
@@ -17,9 +17,9 @@ homepage="http://www.shorewall.net/"
 license="GPL"
 short_desc="An iptables-based firewall for Linux systems"
 
+replaces="runit-void<20141013_2"
 noarch="yes"
 create_wrksrc="yes"
-systemd_services="${pkgname}.service off"
 make_dirs="/var/lib/${pkgname} 0755 0 0"
 conf_files="
  /etc/shorewall/accounting
@@ -67,7 +67,6 @@ conf_files="
  /etc/shorewall/tunnels
  /etc/shorewall/zones"
 
-
 do_build(){
     for product in ${pkgname}{-core,6,}-${version}; do
         cd ${wrksrc}/${product}
@@ -80,6 +79,7 @@ do_install() {
     DESTDIR="${DESTDIR}" ./install.sh
     vmkdir usr/share/doc/${pkgname}
     cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
+    vsv shorewall
 }
 
 shorewall-core_package() {
@@ -91,12 +91,10 @@ shorewall-core_package() {
         DESTDIR="${PKGDESTDIR}" ./install.sh
     }
 }
-
 shorewall6_package() {
     noarch="yes"
     depends="shorewall"
     short_desc+=" - IPv6 support"
-    systemd_services="${pkgname}.service off"
     make_dirs="/var/lib/${pkgname} 0755 0 0"
     pkg_install() {
         cd ${wrksrc}/${pkgname}-${version}