diff --git a/chrony.changes b/chrony.changes
index 53cbe65..7c1f34d 100644
--- a/chrony.changes
+++ b/chrony.changes
@@ -1,8 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 14 10:41:58 UTC 2020 - Reinhard Max <max@suse.com>
+
+- Adjust and rename the sysconfig file, so that it matches the
+  expectations of chronyd.service (bsc#1173277).
+
 -------------------------------------------------------------------
 Sun Sep 13 20:22:46 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
 
 - Update to 3.5.1:
-  * Create new file when writing pidfile (CVE-2020-14367)
+  * Create new file when writing pidfile (CVE-2020-14367, bsc#1174911)
 
 -------------------------------------------------------------------
 Sun Aug  2 21:27:45 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
diff --git a/chrony.spec b/chrony.spec
index fb40134..9ce69e8 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -30,7 +30,7 @@ License:        GPL-2.0-only
 Group:          Productivity/Networking/Other
 URL:            https://chrony.tuxfamily.org/
 Source:         https://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz
-Source2:        chrony.sysconfig
+Source2:        chronyd.sysconfig
 Source3:        chrony.dhclient
 Source4:        chrony.helper
 Source5:        chrony-dnssrv@.service
@@ -218,7 +218,7 @@ echo 'chronyd.service' > \
         %{buildroot}%{_systemdutildir}/ntp-units.d/50-chronyd.list
 
 install -Dpm 0644 %{SOURCE2} \
-  %{buildroot}%{_fillupdir}/sysconfig.chrony
+  %{buildroot}%{_fillupdir}/sysconfig.chronyd
 install -Dpm 755 %{SOURCE4} \
   %{buildroot}%{_libexecdir}/%name/helper
 
@@ -277,7 +277,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
 %{_unitdir}/chrony*.timer
 %{_sbindir}/rcchrony*
 %{_tmpfilesdir}/%{name}.conf
-%{_fillupdir}/sysconfig.chrony
+%{_fillupdir}/sysconfig.chronyd
 %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony
 %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/drift
 %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc
diff --git a/chrony.sysconfig b/chrony.sysconfig
deleted file mode 100644
index 689c7e3..0000000
--- a/chrony.sysconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-## Path:	Network/Chrony
-## Description:	Chrony time synchronization settings
-## Type:	yesno
-## Default:	"yes"
-## ServiceRestart: chronyd
-#
-# Resolve hostnames with IPv4
-#
-CHRONY_IPV4="yes"
-
-## Type:	yesno
-## Default:	"yes"
-## ServiceRestart: chronyd
-#
-# Resolve hostnames with IPv6
-#
-CHRONY_IPV6="yes"
-
-## Type:	yesno
-## Default:	"yes"
-## ServiceRestart: chronyd
-#
-# Lock the chrony daemon process into RAM, preventing it from swapping out
-#
-CHRONY_LOCK_IN_RAM="no"
-
diff --git a/chronyd.sysconfig b/chronyd.sysconfig
new file mode 100644
index 0000000..c6b3e48
--- /dev/null
+++ b/chronyd.sysconfig
@@ -0,0 +1,9 @@
+## Path:	Network/Chrony
+## Description:	Chrony time synchronization settings
+## Type:	string
+## Default:	""
+## ServiceRestart: chronyd
+#
+# Command line options for chronyd
+#
+OPTIONS=""