diff --git a/srcpkgs/netdata/INSTALL b/srcpkgs/netdata/INSTALL
index a3ad66fc5fd..375c45a470a 100644
--- a/srcpkgs/netdata/INSTALL
+++ b/srcpkgs/netdata/INSTALL
@@ -1,6 +1,7 @@
 case ${ACTION} in
     post)
-	chown root:netdata usr/libexec/netdata/plugins.d/apps.plugin
+	chown -R _netdata:_netdata usr/share/netdata/webroot
+	chown root:_netdata usr/libexec/netdata/plugins.d/apps.plugin
 	chmod 4750 usr/libexec/netdata/plugins.d/apps.plugin
 	;;
 esac
diff --git a/srcpkgs/netdata/files/netdata/run b/srcpkgs/netdata/files/netdata/run
index 27c8d3adaed..3761dec6c8c 100755
--- a/srcpkgs/netdata/files/netdata/run
+++ b/srcpkgs/netdata/files/netdata/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-exec netdata -nd
+for f in cache log; do
+	mkdir -p /var/${f}/netdata
+	chown -R _netdata:_netdata /var/${f}/netdata
+done
+
+exec netdata -u netdata -nd
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index 75af0447f0f..4f1b3eeea6b 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.1.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="zlib-devel"
-system_accounts="netdata"
+system_accounts="_netdata"
 conf_files="/etc/${pkgname}/*.conf"
-configure_args="--with-user=netdata --with-webroot=/usr/share/${pkgname}/webroot"
+configure_args="--with-user=_netdata --with-webdir=/usr/share/${pkgname}/webroot"
 short_desc="Real-time performance monitoring, done right"
 maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
 license="GPL-3"