diff --git a/srcpkgs/chrony/chronyd/run b/srcpkgs/chrony/chronyd/run
new file mode 100644
index 00000000000..e877f377f95
--- /dev/null
+++ b/srcpkgs/chrony/chronyd/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chronyd -n
diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template
index d29f92b77b2..a7df0d7de02 100644
--- a/srcpkgs/chrony/template
+++ b/srcpkgs/chrony/template
@@ -1,14 +1,15 @@
 # Template file for 'chrony'
 pkgname=chrony
 version=1.31
-revision=1
+revision=2
 build_style=gnu-configure
+build_options="systemd"
 configure_args="--without-nss"
 hostmakedepends="pkg-config"
 makedepends="libtomcrypt-devel libcap-devel libedit-devel"
 conf_files="/etc/chrony.conf"
 system_accounts="chrony"
-systemd_services="chrony.service on"
+chrony_homedir="/var/db/chrony"
 make_dirs="
 	/var/log/chrony 0755 chrony chrony
 	/var/db/chrony	0755 chrony chrony"
@@ -20,10 +21,9 @@ update_ignore="*oldcvs*"
 distfiles="http://download.tuxfamily.org/chrony/$pkgname-$version.tar.gz"
 checksum=a35e1cae46ecbe14af2023bb47a72a03d79591b2ff65f0072b3400153224996d
 
-build_options="systemd"
-
 post_install() {
-	vinstall ${FILESDIR}/chrony.conf 644 etc
+	vconf ${FILESDIR}/chrony.conf
+	vsv chronyd
 	rm -rf ${DESTDIR}/usr/share/doc
 
 	if [ "$build_option_systemd" ]; then