diff --git a/srcpkgs/lighttpd/files/lighttpd.conf b/srcpkgs/lighttpd/files/lighttpd.conf
index 283be389425..680f757ef40 100644
--- a/srcpkgs/lighttpd/files/lighttpd.conf
+++ b/srcpkgs/lighttpd/files/lighttpd.conf
@@ -3,9 +3,9 @@
 # and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions
 
 server.port		= 80
-server.username		= "lighttpd"
-server.groupname	= "lighttpd"
-server.document-root	= "/srv/www"
+server.username		= "httpd"
+server.groupname	= "httpd"
+server.document-root	= "/srv/httpd"
 server.errorlog		= "/var/log/lighttpd/error.log"
 dir-listing.activate	= "enable"
 index-file.names	= ( "index.html" )
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 55c947c4bd9..a52faf7f715 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,15 +1,15 @@
 # Template file for 'lighttpd'
 pkgname=lighttpd
 version=1.4.39
-revision=1
+revision=2
 makedepends="libmysqlclient-devel lua-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel"
 hostmakedepends="automake pkg-config pcre-devel libtool"
 conf_files="/etc/lighttpd/lighttpd.conf"
-system_accounts="lighttpd"
-lighttpd_homedir="/var/tmp/lighttpd"
+system_accounts="httpd"
+lighttpd_homedir="/src/httpd"
 make_dirs="
 	/srv/www 0755 root root
-	/var/log/lighttpd 0750 lighttpd lighttpd"
+	/var/log/lighttpd 0750 httpd httpd"
 short_desc="A secure, fast, compliant and very flexible web-server"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="2-clause-BSD"