diff --git a/shorewall.spec b/shorewall.spec
index 98e073f..033e1fe 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -49,6 +49,8 @@ Requires(post):	  systemd-units
 Requires(post):   systemd-sysv
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
+Conflicts:        systemd < 38
+Conflicts:        filesystem < 3
 
 %description -n shorewall6
 This package contains the files required for IPV6 functionality of the
@@ -65,6 +67,8 @@ Requires(post):	  systemd-units
 Requires(post):   systemd-sysv
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
+Conflicts:        systemd < 38
+Conflicts:        filesystem < 3
 
 %description lite
 Shorewall Lite is a companion product to Shorewall that allows network
@@ -84,6 +88,8 @@ Requires(post):	  systemd-units
 Requires(post):   systemd-sysv
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
+Conflicts:        systemd < 38
+Conflicts:        filesystem < 3
 
 %description -n shorewall6-lite
 Shorewall6 Lite is a companion product to Shorewall6 (the IPV6
@@ -106,6 +112,8 @@ Requires(post):	  systemd-units
 Requires(post):   systemd-sysv
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
+Conflicts:        systemd < 38
+Conflicts:        filesystem < 3
 
 %description init 
 This package adds additional initialization functionality to Shorewall in two
@@ -144,11 +152,15 @@ done
 # Remove sysv init files
 rm -rf $RPM_BUILD_ROOT%{_initrddir}
 
+# move /sbin to /usr/sbin, /sbin is just a symlink
+mkdir -p %{buildroot}%{_sbindir}
+mv -f %{buildroot}/sbin/shorewall* %{buildroot}%{_sbindir}/ || :
+
 # Fix up file permissions
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/shorewall-lite/{helpers,modules}
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/shorewall6-lite/{helpers,modules}
-chmod 755 $RPM_BUILD_ROOT/sbin/shorewall-lite
-chmod 755 $RPM_BUILD_ROOT/sbin/shorewall6-lite
+chmod 755 $RPM_BUILD_ROOT%{_sbindir}/shorewall-lite
+chmod 755 $RPM_BUILD_ROOT%{_sbindir}/shorewall6-lite
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/shorewall-lite/shorewall-lite.conf
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
 chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/01-shorewall
@@ -296,7 +308,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc shorewall-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples}
-/sbin/shorewall
+%{_sbindir}/shorewall
 %dir %{_sysconfdir}/shorewall
 %config(noreplace) %{_sysconfdir}/shorewall/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/shorewall
@@ -316,7 +328,7 @@ fi
 %files lite
 %defattr(-,root,root,-)
 %doc shorewall-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-/sbin/shorewall-lite
+%{_sbindir}/shorewall-lite
 %dir %{_sysconfdir}/shorewall-lite
 %config(noreplace) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/shorewall-lite
@@ -331,7 +343,7 @@ fi
 %files -n shorewall6
 %defattr(-,root,root,-)
 %doc shorewall6-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples6}
-/sbin/shorewall6
+%{_sbindir}/shorewall6
 %dir %{_sysconfdir}/shorewall6
 %config(noreplace) %{_sysconfdir}/shorewall6/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6
@@ -347,7 +359,7 @@ fi
 %files -n shorewall6-lite
 %defattr(-,root,root,-)
 %doc shorewall6-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-/sbin/shorewall6-lite
+%{_sbindir}/shorewall6-lite
 %dir %{_sysconfdir}/shorewall6-lite
 %config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/shorewall6-lite