diff --git a/chrony-service-helper.patch b/chrony-service-helper.patch
index 50d7964..9e5a9b5 100644
--- a/chrony-service-helper.patch
+++ b/chrony-service-helper.patch
@@ -4,7 +4,7 @@
  PIDFile=/var/run/chrony/chronyd.pid
  EnvironmentFile=-/etc/sysconfig/chronyd
  ExecStart=/usr/sbin/chronyd $OPTIONS
-+ExecStartPost=/usr/share/chrony-helper update-daemon
++ExecStartPost=/usr/lib/chrony/helper update-daemon
  PrivateTmp=yes
  ProtectHome=yes
  ProtectSystem=full
diff --git a/chrony.changes b/chrony.changes
index ea1d4eb..e0ecc95 100644
--- a/chrony.changes
+++ b/chrony.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Dec 20 16:48:14 UTC 2018 - Reinhard Max <max@suse.com>
+
+- Read runtime servers from /var/run/netconfig/chrony.servers to
+  fix bsc#1099272.
+- Move chrony-helper to /usr/lib/chrony/helper, because there
+  should be no executables in /usr/share.
+
+-------------------------------------------------------------------
+Fri Dec 14 08:05:35 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
+
+- Make sure to generate correct sysconfig file (boo#1117147)
+- Update clknetsim to revision 8b48422
+
 -------------------------------------------------------------------
 Thu Nov 22 09:27:58 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
 
diff --git a/chrony.helper b/chrony.helper
index a9c802b..d73bddb 100644
--- a/chrony.helper
+++ b/chrony.helper
@@ -9,7 +9,7 @@ helper_dir=/var/run/chrony-helper
 added_servers_file=$helper_dir/added_servers
 
 network_sysconfig_file=/etc/sysconfig/network
-dhclient_servers_files=/var/lib/dhclient/chrony.servers.*
+dhclient_servers_files=/var/run/netconfig/chrony.servers
 dnssrv_servers_files=$helper_dir/dnssrv@*
 dnssrv_timer_prefix=chrony-dnssrv@
 
diff --git a/chrony.spec b/chrony.spec
index a2fe0ee..637af21 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -17,7 +17,7 @@
 
 
 %define vendorzone opensuse.
-%global clknetsim_ver cdf5e85
+%global clknetsim_ver 8b48422
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
@@ -170,7 +170,7 @@ echo 'chronyd.service' > \
 install -Dpm 0644 %{SOURCE2} \
   %{buildroot}%{_fillupdir}/sysconfig.chrony
 install -Dpm 755 %{SOURCE4} \
-  %{buildroot}%{_datadir}/chrony-helper
+  %{buildroot}%{_libexecdir}/%name/helper
 
 install -d %{buildroot}%{_localstatedir}/log/chrony
 touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc}
@@ -193,7 +193,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
 %service_del_preun chronyd.service chrony-wait.service
 
 %post
-%fillup_only %{name}
+%fillup_only -n chronyd
 %tmpfiles_create %{name}.conf
 %service_add_post chronyd.service chrony-wait.service
 
@@ -214,7 +214,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
 %{_sysconfdir}/dhcp/dhclient.d/chrony.sh
 %{_bindir}/chronyc
 %{_sbindir}/chronyd
-%{_datadir}/chrony-helper
+%{_libexecdir}/%name
 %{_mandir}/man1/chronyc.1%{?ext_man}
 %{_mandir}/man5/chrony.conf.5%{?ext_man}
 %{_mandir}/man8/chronyd.8%{?ext_man}
diff --git a/clknetsim-8b48422.tar.gz b/clknetsim-8b48422.tar.gz
new file mode 100644
index 0000000..502f3dd
--- /dev/null
+++ b/clknetsim-8b48422.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d12ea5345b68c3e18da4a4e18af5ccbe138f1832cb20d807a1ed0aaea7b8055e
+size 42144
diff --git a/clknetsim-cdf5e85.tar.gz b/clknetsim-cdf5e85.tar.gz
deleted file mode 100644
index 0710701..0000000
--- a/clknetsim-cdf5e85.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:780aff25c66537ee30e2b3c5a3fa10afeda5b8b55dc6c326bcd193e0a210bccc
-size 42027