diff --git a/srcpkgs/TerraState/files/terrastate/log/run b/srcpkgs/TerraState/files/terrastate/log/run
new file mode 100644
index 0000000000..8ea6f0f743
--- /dev/null
+++ b/srcpkgs/TerraState/files/terrastate/log/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec 2>&1
+exec vlogger -t terrastate
diff --git a/srcpkgs/TerraState/files/terrastate/run b/srcpkgs/TerraState/files/terrastate/run
new file mode 100644
index 0000000000..b5471b6f32
--- /dev/null
+++ b/srcpkgs/TerraState/files/terrastate/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export TS_STORE=bitcask
+export TS_BITCASK_PATH=/var/lib/terrastate/bitcask
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _terrastate:_terrastate terrastate 2>&1
diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index ce37acfa43..17737dc28c 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -1,18 +1,24 @@
 # Template file for 'TerraState'
 pkgname=TerraState
-version=0.3
+version=1.0.1
 revision=1
+wrksrc=terrastate-$version
+make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
-go_import_path="github.com/the-maldridge/TerraState"
+go_import_path="github.com/the-maldridge/terrastate"
 go_package="${go_import_path}/cmd/terrastate"
 hostmakedepends="git"
-short_desc="Remote state for TerraForm"
+short_desc="Remote state for Terraform"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
-homepage="https://github.com/the-maldridge/TerraState"
-distfiles="https://github.com/the-maldridge/TerraState/archive/v$version.tar.gz"
-checksum=5536becee55107d4fe4c3c02304b035761e3496f4692cde604eac03556817e1f
+homepage="https://github.com/the-maldridge/terrastate"
+distfiles="https://github.com/the-maldridge/terrastate/archive/v$version.tar.gz"
+checksum=5c5e8cea99d93d5a9d1fa62ede403729edab88c84f9fc456e2eeeb1fbfb9223c
+system_groups="_terrastate"
+system_accounts="_terrastate"
+_terrastate_homedir="/var/lib/terrastate"
 
 post_install() {
 	vlicense LICENSE
+	vsv terrastate
 }