diff --git a/srcpkgs/caddy/INSTALL b/srcpkgs/caddy/INSTALL
index 5eaa8fe062a..58a9ee6305f 100644
--- a/srcpkgs/caddy/INSTALL
+++ b/srcpkgs/caddy/INSTALL
@@ -1,5 +1,6 @@
 case "${ACTION}" in
 post)
 	setcap CAP_NET_BIND_SERVICE=+ep usr/bin/caddy
+	chown -R caddy:caddy /etc/caddy
 	;;
 esac
diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run
new file mode 100755
index 00000000000..6940daacbb0
--- /dev/null
+++ b/srcpkgs/caddy/files/caddy/run
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+CADDYPATH="/var/lib/caddy"
+export CADDYPATH
+
+mkdir -p "$CADDYPATH"
+chmod 0700 "$CADDYPATH"
+chown caddy:caddy "$CADDYPATH"
+
+cd /etc/caddy
+exec chpst -o 8192 -u caddy caddy
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index f22c251957a..08612d03baf 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
 version=0.10.8
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/mholt/caddy"
 go_package="${go_import_path}/caddy"
@@ -12,3 +12,10 @@ license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/mholt/caddy/archive/v${version}.tar.gz"
 checksum=3328efc8b64a428d49dd27edf44c0b1d9dfdc8879366663ce002bafc3a7b2b90
+
+system_accounts="caddy"
+make_dirs="/etc/caddy 0700 caddy caddy"
+
+post_install() {
+	vsv caddy
+}