diff --git a/chrony.changes b/chrony.changes
index 4d5f520..74c7d0f 100644
--- a/chrony.changes
+++ b/chrony.changes
@@ -1,27 +1,32 @@
+-------------------------------------------------------------------
+Thu Aug  2 07:52:58 UTC 2018 - mpluskal@suse.com
+
+- Mention all sources as such in spec file
+- Fix formatting of changelog
+- Drop reference to change is not present
+
 -------------------------------------------------------------------
 Wed Aug  1 16:36:17 UTC 2018 - bwiedemann@suse.com
 
 - Update to version 3.3
-ed
-  + Enhancements:
-    Add burst option to server/pool directive
-    Add stratum and tai options to refclock directive
-    Add support for Nettle crypto library
-    Add workaround for missing kernel receive timestamps on Linux
-    Wait for late hardware transmit timestamps
-    Improve source selection with unreachable sources
-    Improve protection against replay attacks on symmetric mode
-    Allow PHC refclock to use socket in /var/run/chrony
-    Add shutdown command to stop chronyd
-    Simplify format of response to manual list command
-    Improve handling of unknown responses in chronyc
-  + Bug fixes:
-    Respond to NTPv1 client requests with zero mode
-    Fix -x option to not require CAP_SYS_TIME under non-root user
-    Fix acquisitionport directive to work with privilege separation
-    Fix handling of socket errors on Linux to avoid high CPU usage
-    Fix chronyc to not get stuck in infinite loop after clock step
-  + make package build reproducible (boo#1047218)
+  * Enhancements:
+    + Add burst option to server/pool directive
+    + Add stratum and tai options to refclock directive
+    + Add support for Nettle crypto library
+    + Add workaround for missing kernel receive timestamps on Linux
+    + Wait for late hardware transmit timestamps
+    + Improve source selection with unreachable sources
+    + Improve protection against replay attacks on symmetric mode
+    + Allow PHC refclock to use socket in /var/run/chrony
+    + Add shutdown command to stop chronyd
+    + Simplify format of response to manual list command
+    + Improve handling of unknown responses in chronyc
+  * Bug fixes:
+    + Respond to NTPv1 client requests with zero mode
+    + Fix -x option to not require CAP_SYS_TIME under non-root user
+    + Fix acquisitionport directive to work with privilege separation
+    + Fix handling of socket errors on Linux to avoid high CPU usage
+    + Fix chronyc to not get stuck in infinite loop after clock step
 
 -------------------------------------------------------------------
 Wed Apr 18 02:55:54 UTC 2018 - mpost@suse.com
diff --git a/chrony.spec b/chrony.spec
index f1c6b75..61be17c 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -28,7 +28,7 @@ Release:        0
 Summary:        System Clock Synchronization Client and Server
 License:        GPL-2.0-only
 Group:          Productivity/Networking/Other
-Url:            https://chrony.tuxfamily.org/
+URL:            https://chrony.tuxfamily.org/
 Source:         https://download.tuxfamily.org/chrony/chrony-%{version}.tar.gz
 Source2:        chrony.sysconfig
 Source3:        chrony.dhclient
@@ -36,6 +36,7 @@ Source4:        chrony.helper
 Source5:        chrony-dnssrv@.service
 Source6:        chrony-dnssrv@.timer
 Source7:        https://download.tuxfamily.org/chrony/chrony-3.3-tar-gz-asc.txt#/chrony-%{version}.tar.gz.sig
+Source8:        chrony.keyring
 # Simulator for test suite
 Source10:       https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
@@ -110,7 +111,7 @@ sed -e 's|^\pool|! pool|' \
 cat << EOF >> chrony.conf
 
 # Also include any directives found in configuration files in /etc/chrony.d
-include /etc/chrony.d/*.conf
+include %{_sysconfdir}/chrony.d/*.conf
 EOF
 
 touch -r examples/chrony.conf.example2 chrony.conf
@@ -160,9 +161,9 @@ install -d %{buildroot}%{sbindir}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchronyd
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcchrony-wait
 
-install -d %{buildroot}%{_prefix}/lib/systemd/ntp-units.d
+install -d %{buildroot}%{_libexecdir}/systemd/ntp-units.d
 echo 'chronyd.service' > \
-        %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/50-chronyd.list
+        %{buildroot}%{_libexecdir}/systemd/ntp-units.d/50-chronyd.list
 
 install -Dpm 0644 %{SOURCE2} \
   %{buildroot}%{_fillupdir}/sysconfig.chrony
@@ -208,10 +209,10 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d "%{_localstatedir}/
 %{_bindir}/chronyc
 %{_sbindir}/chronyd
 %{_datadir}/chrony-helper
-%{_mandir}/man1/chronyc.1%{ext_man}
-%{_mandir}/man5/chrony.conf.5%{ext_man}
-%{_mandir}/man8/chronyd.8%{ext_man}
-%{_prefix}/lib/systemd/ntp-units.d/*.list
+%{_mandir}/man1/chronyc.1%{?ext_man}
+%{_mandir}/man5/chrony.conf.5%{?ext_man}
+%{_mandir}/man8/chronyd.8%{?ext_man}
+%{_libexecdir}/systemd/ntp-units.d/*.list
 %{_unitdir}/chrony*.service
 %{_unitdir}/chrony*.timer
 %{_sbindir}/rcchrony*