diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index ace69eeb262..f58aa076f07 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.12
-revision=2
+revision=3
 wrksrc=httpd-${version}
 build_style=gnu-configure
 configure_args="--prefix= --enable-pie --enable-modules=all
@@ -111,9 +111,8 @@ post_install() {
 	ln -fs /usr/share/apache-httpd/build ${DESTDIR}/etc/httpd/build
 
 	# Remove unused stuff.
-	rm -f ${DESTDIR}/srv/httpd/cgi-bin/test-cgi
-	rm -f ${DESTDIR}/srv/httpd/cgi-bin/printenv
-	rm -f ${DESTDIR}/srv/httpd/index.html
+	mv ${DESTDIR}/srv/httpd/cgi-bin ${DESTDIR}/usr/share/apache-httpd
+	rm -rf ${DESTDIR}/srv/httpd
 
 	# systemd and logrotate files.
 	vinstall ${FILESDIR}/apache.logrotate 644 etc/logrotate.d apache