diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
index ece1efba0ce..7583a552d93 100644
--- a/srcpkgs/consul/files/consul/run
+++ b/srcpkgs/consul/files/consul/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
 exec 2>&1
-exec consul agent -config-dir=/etc/consul.d
+exec chpst -u _consul:_consul consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index a9796ff5c79..2d032167d2a 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=5e08e229dbdaed5adf3ca99afe9df247c51507da
@@ -12,6 +12,9 @@ license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=ce5e6666c9bd3ee8dcd60b2ed6e082ab9893fda3c0a2218add649c197f34f2f3
+system_accounts="_consul"
+make_dirs="/etc/consul.d 0755 _consul _consul
+ /var/lib/consul 0750 _consul _consul"
 
 post_install() {
 	vlicense LICENSE