diff --git a/srcpkgs/chrony/files/chrony.conf b/srcpkgs/chrony/files/chrony.conf
index 05455aec708..c9b44befbac 100644
--- a/srcpkgs/chrony/files/chrony.conf
+++ b/srcpkgs/chrony/files/chrony.conf
@@ -43,25 +43,29 @@
 # 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 iburst
-server 1.pool.ntp.org iburst
-server 2.pool.ntp.org iburst
+! server foo.example.net iburst
+! server bar.example.net iburst
+! server baz.example.net iburst
+
+pool 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 0.pool.ntp.org offline
-! server 1.pool.ntp.org offline
-! server 2.pool.ntp.org offline
+! server foo.example.net offline
+! server bar.example.net offline
+! server baz.example.net offline
+
+! pool 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
 # have the 'front-line' interface to the public NTP servers, you can
 # 'peer' these machines together to increase robustness.
 
-! peer ntp0.my-company.com
+! peer foo.example.net
 
 # There are other options to the 'server' and 'peer' directives that you
 # might want to use.  For example, you can ignore measurements whose
@@ -79,7 +83,7 @@ server 2.pool.ntp.org iburst
 # seems OK for a LAN environment.
 
 ! maxupdateskew 100
-maxupdateskew 5
+! maxupdateskew 5
 
 #######################################################################
 ### FILENAMES ETC
@@ -107,6 +111,7 @@ 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
@@ -125,14 +130,14 @@ generatecommandkey
 # Enable these two options to use this.
 
 dumponexit
-dumpdir /var/log/chrony
+dumpdir /var/db/chrony
 
 # chronyd writes its process ID to a file.  If you try to start a second
 # copy of chronyd, it will detect that the process named in the file is
 # still running and bail out.  If you want to change the path to the PID
 # file, uncomment this line and edit it.  The default path is shown.
 
-pidfile /run/chronyd.pid
+! pidfile /var/run/chronyd.pid
 
 #######################################################################
 ### INITIAL CLOCK CORRECTION
@@ -145,7 +150,7 @@ pidfile /run/chronyd.pid
 # of the clock.  Some software can get upset if the system clock jumps
 # (especially backwards), so be careful!
 
-! makestep 10 1
+makestep 10 1
 
 #######################################################################
 ### LOGGING
@@ -155,13 +160,13 @@ pidfile /run/chronyd.pid
 # produce some graphs of your system's timekeeping performance, or you
 # need help in debugging a problem.
 
-logdir /var/log/chrony
+! logdir /var/log/chrony
 ! log measurements statistics tracking
 
 # If you have real time clock support enabled (see below), you might want
 # this line instead:
 
-log measurements statistics tracking rtc
+! log measurements statistics tracking rtc
 
 #######################################################################
 ### ACTING AS AN NTP SERVER
@@ -233,13 +238,18 @@ log measurements statistics tracking rtc
 # several people, you need to set up a mailing list or sendmail alias
 # for them and use the address of that.)
 
-! mailonchange wibble@foobar.org 0.5
+! mailonchange wibble@foo.example.net 0.5
 
 #######################################################################
 ### COMMAND ACCESS
 # The program chronyc is used to show the current operation of chronyd
 # and to change parts of its configuration whilst it is running.
 
+# By default chronyd binds to the loopback interface.  Uncomment the
+# following lines to allow receiving command packets from remote hosts.
+! bindcmdaddress 0.0.0.0
+! bindcmdaddress ::
+
 # Normally, chronyd will only allow connections from chronyc on the same
 # machine as itself.  This is for security.  If you have a subnet
 # 192.168.*.* and you want to be able to use chronyc from any machine on
@@ -268,7 +278,7 @@ log measurements statistics tracking rtc
 # You need to have 'enhanced RTC support' compiled into your Linux
 # kernel.  (Note, these options apply only to Linux.)
 
-! rtcfile /var/db/chrony/rtc
+rtcfile /var/db/chrony/rtc
 
 # Your RTC can be set to keep Universal Coordinated Time (UTC) or local
 # time.  (Local time means UTC +/- the effect of your timezone.)  If you
@@ -278,7 +288,7 @@ log measurements statistics tracking rtc
 # that will work better if your RTC maintains local time.  You take your
 # pick!
 
-rtconutc
+! rtconutc
 
 # By default chronyd assumes that the enhanced RTC device is accessed as
 # /dev/rtc.  If it's accessed somewhere else on your system (e.g. you're
diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template
index ada1fac0f1e..b98009e66fb 100644
--- a/srcpkgs/chrony/template
+++ b/srcpkgs/chrony/template
@@ -1,6 +1,6 @@
 # Template file for 'chrony'
 pkgname=chrony
-version=1.31.1
+version=2.0
 revision=1
 build_pie=yes
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://chrony.tuxfamily.org/"
 distfiles="http://download.tuxfamily.org/chrony/$pkgname-$version.tar.gz"
-checksum=0ba9f4b58e20b2eaae921eb8c798108ef72d8ea6fdcc7eb0167b56690d212348
+checksum=f4da5f5071e77314b49281c48c35a03d07d76cbc7ec19e787b4414a86023b68b
 
 post_install() {
 	vconf ${FILESDIR}/chrony.conf