diff --git a/srcpkgs/lighttpd/files/lighttpd/run b/srcpkgs/lighttpd/files/lighttpd/run
old mode 100755
new mode 100644
index 36e7a92673b..b1d0bb000f7
--- a/srcpkgs/lighttpd/files/lighttpd/run
+++ b/srcpkgs/lighttpd/files/lighttpd/run
@@ -1,16 +1,2 @@
 #!/bin/sh
-[ -s conf ] && . ./conf
-
-: ${ROOTDIR:=/srv/www/lighttpd}
-: ${LOGDIR:=/var/log/lighttpd}
-
-if [ ! -d $ROOTDIR ]; then
-	mkdir -p $ROOTDIR
-	chown _lighttpd:_lighttpd $ROOTDIR
-fi
-if [ ! -d $LOGDIR ]; then
-	mkdir -p $LOGDIR
-	chown _lighttpd:_lighttpd $LOGDIR
-fi
-
 exec lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 17e178dee3b..c0264e238bd 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.52
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
  -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true
@@ -13,7 +13,7 @@ hostmakedepends="pkg-config"
 makedepends="libuuid-devel lua-devel libxml2-devel libev-devel sqlite-devel gdbm-devel
  pcre-devel libressl-devel fcgi-devel libldap-devel attr-devel libmemcached-devel
  mit-krb5-devel"
-short_desc="A secure, fast, compliant and very flexible web-server"
+short_desc="Secure, fast, compliant and very flexible web-server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://lighttpd.net"
@@ -25,6 +25,10 @@ system_accounts="_${pkgname}"
 _lighttpd_homedir="/srv/www/${pkgname}"
 lib32disabled=yes
 
+make_dirs="
+ /srv/www/lighttpd 0755 lighttpd lighttpd
+ /var/log/lighttpd 0755 lighttpd lighttpd"
+
 post_install() {
 	vlicense COPYING
 	vsv lighttpd