diff --git a/srcpkgs/openssh/files/sshd/run b/srcpkgs/openssh/files/sshd/run
new file mode 100755
index 00000000000..7dcbb6205e9
--- /dev/null
+++ b/srcpkgs/openssh/files/sshd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+ssh-keygen -A # Will generate host keys if they don't already exist
+exec /usr/sbin/sshd -D
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 78771325e49..46b5c81df31 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -3,7 +3,7 @@ _desc="The OpenSSH implementation of SSH protocol"
 
 pkgname=openssh
 version=6.7p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -58,6 +58,7 @@ post_install() {
 openssh-server_package() {
 	conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
 	make_dirs="/var/chroot/ssh 0755 root root"
+	replaces="runit-void<20141013_2"
 	depends="openssh>=$version"
 	short_desc="${_desc} - server"
 	pkg_install() {
@@ -74,5 +75,6 @@ openssh-server_package() {
 			install -m644 ${FILESDIR}/*.{socket,service} \
 				${PKGDESTDIR}/usr/lib/systemd/system
 		fi
+		vsv sshd
 	}
 }