diff --git a/openssh.spec b/openssh.spec
index 69fa755..53299a7 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -270,6 +270,8 @@ Requires: fipscheck-lib%{_isa} >= 1.3.0
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+Conflicts: systemd < 38
+Conflicts: filesystem < 3
 # This is actually needed for the %triggerun script but Requires(triggerun)
 # is not valid.  We can use %post because this particular %triggerun script
 # should fire just after this package is installed.
@@ -312,6 +314,7 @@ Group: System Environment/Base
 Version: %{pam_ssh_agent_ver}
 Release: %{pam_ssh_agent_rel}.%{openssh_rel}%{?dist}%{?rescue_rel}
 License: BSD
+Conflicts: filesystem < 3
 
 %description
 SSH (Secure SHell) is a program for logging into and executing
@@ -560,7 +563,7 @@ popd
 %if %{pam_ssh_agent}
 pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
 LDFLAGS="$SAVE_LDFLAGS"
-%configure --with-selinux --libexecdir=/%{_lib}/security --with-mantype=man
+%configure --with-selinux --libexecdir=%{_libdir}/security --with-mantype=man
 make
 popd
 %endif
@@ -777,7 +780,7 @@ fi
 %files -n pam_ssh_agent_auth
 %defattr(-,root,root)
 %doc pam_ssh_agent_auth-%{pam_ssh_agent_ver}/OPENSSH_LICENSE
-%attr(0755,root,root) /%{_lib}/security/pam_ssh_agent_auth.so
+%attr(0755,root,root) /%{_libdir}/security/pam_ssh_agent_auth.so
 %attr(0644,root,root) %{_mandir}/man8/pam_ssh_agent_auth.8*
 %endif