diff --git a/srcpkgs/apache/files/apache/run b/srcpkgs/apache/files/apache/run
new file mode 100755
index 00000000000..5fcf6470fbf
--- /dev/null
+++ b/srcpkgs/apache/files/apache/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+mkdir -p /run/httpd || exit 1
+chmod 0710 /run/httpd || exit 1
+chown root:httpd /run/httpd || exit 1
+exec httpd -DNO_DETACH
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index be1030aff6e..0dc11661f3d 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.10
-revision=2
+revision=3
 wrksrc=httpd-${version}
 build_style=gnu-configure
 configure_args="--prefix= --enable-pie --enable-modules=all
@@ -44,6 +44,7 @@ license="Apache-2.0"
 distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 checksum=176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a
 
+replaces="runit-void<20141013_2"
 system_accounts="httpd"
 httpd_descr="Apache HTTP server"
 httpd_homedir="/srv/httpd"
@@ -59,6 +60,9 @@ if [ "$build_option_systemd" ]; then
 fi
 
 pre_configure() {
+	# SSL_CTX_use_certificate_chain() conflicts with libressl-2.1.
+	sed -e 's,SSL_CTX_use_certificate_chain,_SSL_CTX_use_certificate_chain,g' -i modules/ssl/*.[ch]
+
         # set default user
 	sed -e 's#User daemon#User httpd#' \
 	    -e 's#Group daemon#Group httpd#' \
@@ -100,6 +104,8 @@ post_install() {
 		vinstall ${FILESDIR}/apache.tmpfiles 644 usr/lib/tmpfiles.d apache.conf
 	fi
 
+	vsv apache
+
 	rm -rf ${DESTDIR}/etc/httpd/original
 }