diff --git a/srcpkgs/samba/files/nmbd/log/run b/srcpkgs/samba/files/nmbd/log/run
new file mode 100755
index 00000000000..ea5ff8e2186
--- /dev/null
+++ b/srcpkgs/samba/files/nmbd/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p nmbd.notice
diff --git a/srcpkgs/samba/files/nmbd/run b/srcpkgs/samba/files/nmbd/run
new file mode 100755
index 00000000000..dfd75fcf7d4
--- /dev/null
+++ b/srcpkgs/samba/files/nmbd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec nmbd -F -S
diff --git a/srcpkgs/samba/files/smbd/log/run b/srcpkgs/samba/files/smbd/log/run
new file mode 100755
index 00000000000..f58842d4873
--- /dev/null
+++ b/srcpkgs/samba/files/smbd/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p smbd.notice
diff --git a/srcpkgs/samba/files/smbd/run b/srcpkgs/samba/files/smbd/run
new file mode 100755
index 00000000000..a7b74537292
--- /dev/null
+++ b/srcpkgs/samba/files/smbd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec smbd -F -S
diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template
index 29fa3d210db..71d7895455c 100644
--- a/srcpkgs/samba/template
+++ b/srcpkgs/samba/template
@@ -1,7 +1,7 @@
 # Template file for 'samba'
 pkgname=samba
 version=3.6.24
-revision=2
+revision=3
 build_wrksrc=source3
 build_style=gnu-configure
 configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap
@@ -20,6 +20,7 @@ distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz"
 checksum=11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7
 
 lib32disabled=yes
+replaces="runit-void<20141013_2"
 build_options="systemd"
 conf_files="/etc/pam.d/samba"
 hostmakedepends="pkg-config perl python-devel"
@@ -41,7 +42,6 @@ fi
 pre_configure() {
 	sed -e 's,XFS_QUOTA_,FS_QUOTA_,g' -i lib/sysquotas_xfs.c
 }
-
 post_install() {
 	cd ${wrksrc}
 	# conf file
@@ -82,6 +82,9 @@ post_install() {
 		vinstall ${FILESDIR}/samba.tmpfiles 644 usr/lib/tmpfiles.d samba.conf
 	fi
 
+	vsv nmbd
+	vsv smbd
+
 	# PAM support
 	vinstall ${FILESDIR}/samba.pam 644 etc/pam.d samba