diff --git a/debian/changelog b/debian/changelog
index 8866c26..a293f2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mendel-minimal (5-1) mendel-beaker; urgency=medium
+
+  * Fixes set-datetime to stop timesyncd and restart it when
+    setting the time.
+
+ -- AIY Projects <support-aiyprojects@google.com>  Mon, 28 Jan 2019 13:31:00 -0800
+
 mendel-minimal (4-1) mendel-beaker; urgency=medium
 
   * Fixes the set-datetime runonce script to make use of timedatectl for
diff --git a/etc/runonce.d/98-set-datetime b/etc/runonce.d/98-set-datetime
index 9cdfd79..97c2b51 100755
--- a/etc/runonce.d/98-set-datetime
+++ b/etc/runonce.d/98-set-datetime
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 PROGNAME=$(basename $(readlink -f $0))
+systemctl stop systemd-timesyncd
 date --set="$(stat /lost+found |grep Change |sed -e 's/^Change: //g' -e 's/+0000//g')"
-timedatectl set-ntp false
-timedatectl set-time "$(date '+%Y-%m-%d %H:%M:%S')"
-timedatectl set-ntp true
+systemctl start systemd-timesyncd