diff --git a/srcpkgs/chrony/files/chrony.conf b/srcpkgs/chrony/files/chrony.conf
index c6e31f9ecde..05455aec708 100644
--- a/srcpkgs/chrony/files/chrony.conf
+++ b/srcpkgs/chrony/files/chrony.conf
@@ -40,21 +40,21 @@
 # more 'NTP servers'.  You will probably find that your Internet Service
 # Provider or company have one or more NTP servers that you can specify.
 # Failing that, there are a lot of public NTP servers.  There is a list
-# you can access at
-# http://www.eecis.udel.edu/~mills/ntp/servers.htm.
+# you can access at http://support.ntp.org/bin/view/Servers/WebHome or
+# you can use servers from the pool.ntp.org project.
 
-server 0.pool.ntp.org
-server 1.pool.ntp.org
-server 2.pool.ntp.org
+server 0.pool.ntp.org iburst
+server 1.pool.ntp.org iburst
+server 2.pool.ntp.org iburst
  
 # However, for dial-up use you probably want these instead.  The word
 # 'offline' means that the server is not visible at boot time.  Use
 # chronyc's 'online' command to tell chronyd that these servers have
 # become visible after you go on-line.
 
-! server ntp0.your-isp.com offline
-! server ntp1.your-isp.com offline
-! server ntp.public-server.org offline
+! server 0.pool.ntp.org offline
+! server 1.pool.ntp.org offline
+! server 2.pool.ntp.org offline
 
 # You may want to specify NTP 'peers' instead.  If you run a network
 # with a lot of computers and want several computers running chrony to
@@ -106,6 +106,9 @@ keyfile /var/db/chrony/keys
 
 commandkey 1
 
+# With this directive a random password will be generated automatically.
+generatecommandkey
+
 # chronyd can save the measurement history for the servers to files when
 # it it exits.  This is useful in 2 situations:
 #
@@ -133,17 +136,16 @@ pidfile /run/chronyd.pid
 
 #######################################################################
 ### INITIAL CLOCK CORRECTION
-# This option is only useful if your NTP servers are visible at boot
-# time.  This probably means you are on a LAN.  If so, the following
-# option will choose the best-looking of the servers and correct the
-# system time to that.  The value '10' means that if the error is less
+# This option is useful to quickly correct the clock on start if it's
+# off by a large amount.  The value '10' means that if the error is less
 # than 10 seconds, it will be gradually removed by speeding up or
 # slowing down your computer's clock until it is correct.  If the error
 # is above 10 seconds, an immediate time jump will be applied to correct
-# it.  Some software can get upset if the system clock jumps (especially
-# backwards), so be careful!
+# it.  The value '1' means the step is allowed only on the first update
+# of the clock.  Some software can get upset if the system clock jumps
+# (especially backwards), so be careful!
 
-! initstepslew 10 ntp0.your-company.com ntp1.your-company.com ntp2.your-company.com
+! makestep 10 1
 
 #######################################################################
 ### LOGGING
@@ -154,7 +156,7 @@ pidfile /run/chronyd.pid
 # need help in debugging a problem.
 
 logdir /var/log/chrony
-#log measurements statistics tracking
+! log measurements statistics tracking
 
 # If you have real time clock support enabled (see below), you might want
 # this line instead:
@@ -255,13 +257,6 @@ log measurements statistics tracking rtc
 # put into chronyc to allow you to modify chronyd's parameters.  By
 # default all you can do is view information about chronyd's operation.
 
-# Some people have reported that the need the following line to allow
-# chronyc to work even on the same machine.  This should not be
-# necessary, and the problem is being investigated.  You can leave this
-# line enabled, as it's benign otherwise.
-
-cmdallow 127.0.0.1
-
 #######################################################################
 ### REAL TIME CLOCK
 # chronyd can characterise the system's real-time clock.  This is the
diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template
index 72c85757537..adcbcacd0e5 100644
--- a/srcpkgs/chrony/template
+++ b/srcpkgs/chrony/template
@@ -1,7 +1,7 @@
 # Template file for 'chrony'
 pkgname=chrony
-version=1.30
-revision=2
+version=1.31
+revision=1
 build_style=gnu-configure
 configure_args="--without-nss"
 hostmakedepends="pkg-config"
@@ -17,14 +17,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://chrony.tuxfamily.org/"
 distfiles="http://download.tuxfamily.org/chrony/$pkgname-$version.tar.gz"
-checksum=43aca956a0beb2c4847feffc847fec2c429ee9afb6252c7a499bbd68933046dd
+checksum=a35e1cae46ecbe14af2023bb47a72a03d79591b2ff65f0072b3400153224996d
+
+build_options="systemd"
 
 post_install() {
 	vinstall ${FILESDIR}/chrony.conf 644 etc
-	vinstall ${FILESDIR}/chrony.service 644 usr/lib/systemd/system
 	rm -rf ${DESTDIR}/usr/share/doc
 
-	# for systemd-timedated.
-	vmkdir usr/lib/systemd/ntp-units.d
-	echo "chrony.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/50-chrony.list
+	if [ "$build_option_systemd" ]; then
+		vinstall ${FILESDIR}/chrony.service 644 usr/lib/systemd/system
+		# for systemd-timedated.
+		vmkdir usr/lib/systemd/ntp-units.d
+		echo "chrony.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/50-chrony.list
+	fi
 }