diff --git a/chrony.spec b/chrony.spec
index 21a0316..2a6c685 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -25,6 +25,9 @@ Requires(pre):  shadow-utils
 Requires(post): systemd-units info chkconfig
 Requires(preun): systemd-units info
 Requires(postun): systemd-units
+BuildRequires: systemd-units
+Conflicts:        systemd < 38
+Conflicts:        filesystem < 3
 
 %description
 A client/server for the Network Time Protocol, this program keeps your
@@ -66,11 +69,11 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/chrony
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 
 install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.conf
 install -m 640 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys
-install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT/lib/systemd/system/chronyd.service
+install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/chronyd.service
 install -m 755 -p %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/chrony-helper
 install -m 644 -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/chrony
 install -m 755 -p %{SOURCE7} \
@@ -78,7 +81,7 @@ install -m 755 -p %{SOURCE7} \
 install -m 755 -p %{SOURCE8} \
         $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d/chrony.sh
 install -m 644 -p %{SOURCE9} \
-        $RPM_BUILD_ROOT/lib/systemd/system/chrony-wait.service
+        $RPM_BUILD_ROOT%{_unitdir}/chrony-wait.service
 
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/chrony/{drift,rtc}
 
@@ -131,7 +134,7 @@ fi
 %{_sbindir}/chronyd
 %{_libexecdir}/chrony-helper
 %{_infodir}/chrony.info*
-/lib/systemd/system/chrony*.service
+%{_unitdir}/chrony*.service
 %{_mandir}/man[158]/%{name}*.[158]*
 %dir %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony
 %ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/drift