diff --git a/bacula.spec b/bacula.spec
index 18a773c..bca3554 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -140,6 +140,8 @@ Requires(post): systemd-sysv
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+Conflicts:     systemd < 38
+Conflicts:     filesystem < 3
 
 %description director-common
 Bacula is a set of programs that allow you to manage the backup,
@@ -161,6 +163,8 @@ Requires(post): systemd-sysv
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+Conflicts:     systemd < 38
+Conflicts:     filesystem < 3
 
 %description client
 Bacula is a set of programs that allow you to manage the backup,
@@ -180,6 +184,8 @@ Requires(post): systemd-sysv
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+Conflicts:     systemd < 38
+Conflicts:     filesystem < 3
 
 %description storage-common
 Bacula is a set of programs that allow you to manage the backup,
@@ -629,7 +635,7 @@ install -m 644 -D bacula-sqlite/scripts/logwatch/logfile.bacula.conf %{buildroot
 install -m 644 -D bacula-sqlite/scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
 
 # Systemd unit files
-mkdir -p ${buildroot}%{_unitdir}
+mkdir -p %{buildroot}%{_unitdir}
 install -m 755 -D %{SOURCE7}  %{buildroot}%{_unitdir}/bacula-fd.service
 install -m 755 -D %{SOURCE8}  %{buildroot}%{_unitdir}/bacula-dir.service
 install -m 755 -D %{SOURCE9}  %{buildroot}%{_unitdir}/bacula-sd.service