diff --git a/audit.spec b/audit.spec
index 39519b8..317db7a 100644
--- a/audit.spec
+++ b/audit.spec
@@ -19,6 +19,7 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires(post): systemd-units systemd-sysv chkconfig coreutils
 Requires(preun): systemd-units
 Requires(postun): systemd-units coreutils
+Conflicts: filesystem < 3
 
 
 %description
@@ -30,6 +31,7 @@ the audit subsystem in the Linux 2.6 kernel.
 Summary: Dynamic library for libaudit
 License: LGPLv2+
 Group: Development/Libraries
+Conflicts: filesystem < 3
 
 %description libs
 The audit-libs package contains the dynamic libraries needed for 
@@ -76,6 +78,7 @@ BuildRequires: libprelude-devel >= 0.9.16
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs = %{version}-%{release}
 Requires: openldap
+Conflicts: filesystem < 3
 
 %description -n audispd-plugins
 The audispd-plugins package provides plugins for the real-time
@@ -88,12 +91,12 @@ behavior.
 
 %build
 autoreconf -v --install
-%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
+%configure --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{sbin,etc/{sysconfig,audispd/plugins.d}}
+mkdir -p $RPM_BUILD_ROOT/{etc/{sysconfig,audispd/plugins.d}}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man5,man8}
 mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
@@ -101,22 +104,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/spool/audit
 make DESTDIR=$RPM_BUILD_ROOT install
 
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-# This winds up in the wrong place when libtool is involved
-mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT%{_libdir}
-mv $RPM_BUILD_ROOT/%{_lib}/libauparse.a $RPM_BUILD_ROOT%{_libdir}
-curdir=`pwd`
-cd $RPM_BUILD_ROOT/%{_libdir}
-LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libaudit.so.1.*.*\``
-ln -s ../../%{_lib}/$LIBNAME libaudit.so
-LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libauparse.so.0.*.*\``
-ln -s ../../%{_lib}/$LIBNAME libauparse.so
-cd $curdir
 # Remove these items so they don't get picked up.
-rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.so
-rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.so
-rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.la
-rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libaudit.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libauparse.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_audit.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_audit.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_auparse.a
@@ -141,7 +131,7 @@ make check
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
+%post libs -p %{_sbindir}/ldconfig
 
 %post
 if [ $1 -eq 1 ] ; then 
@@ -156,7 +146,7 @@ if [ $1 -eq 0 ] ; then
     /bin/systemctl stop auditd.service > /dev/null 2>&1 || :
 fi
 
-%postun libs -p /sbin/ldconfig
+%postun libs -p %{_sbindir}/ldconfig
 
 %postun
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -180,8 +170,8 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
-%attr(755,root,root) /%{_lib}/libaudit.so.1*
-%attr(755,root,root) /%{_lib}/libauparse.*
+%attr(755,root,root) %{_libdir}/libaudit.so.1*
+%attr(755,root,root) %{_libdir}/libauparse.*
 %config(noreplace) %attr(640,root,root) /etc/libaudit.conf
 %{_mandir}/man5/libaudit.conf.5.gz
 
@@ -222,12 +212,12 @@ fi
 %attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz
 %attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz
 %attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz
-%attr(750,root,root) /sbin/auditctl
-%attr(750,root,root) /sbin/auditd
-%attr(755,root,root) /sbin/ausearch
-%attr(755,root,root) /sbin/aureport
-%attr(750,root,root) /sbin/autrace
-%attr(750,root,root) /sbin/audispd
+%attr(750,root,root) %{_sbindir}/auditctl
+%attr(750,root,root) %{_sbindir}/auditd
+%attr(755,root,root) %{_sbindir}/ausearch
+%attr(755,root,root) %{_sbindir}/aureport
+%attr(750,root,root) %{_sbindir}/autrace
+%attr(750,root,root) %{_sbindir}/audispd
 %attr(755,root,root) %{_bindir}/aulast
 %attr(755,root,root) %{_bindir}/aulastlog
 %attr(755,root,root) %{_bindir}/ausyscall
@@ -250,15 +240,15 @@ fi
 %attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audispd-zos-remote.conf
 %config(noreplace) %attr(640,root,root) /etc/audisp/zos-remote.conf
-%attr(750,root,root) /sbin/audispd-zos-remote
+%attr(750,root,root) %{_sbindir}/audispd-zos-remote
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/au-prelude.conf
 %config(noreplace) %attr(640,root,root) /etc/audisp/audisp-prelude.conf
-%attr(750,root,root) /sbin/audisp-prelude
+%attr(750,root,root) %{_sbindir}/audisp-prelude
 %attr(644,root,root) %{_mandir}/man5/audisp-prelude.conf.5.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-prelude.8.gz
 %config(noreplace) %attr(640,root,root) /etc/audisp/audisp-remote.conf
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/au-remote.conf
-%attr(750,root,root) /sbin/audisp-remote
+%attr(750,root,root) %{_sbindir}/audisp-remote
 %attr(700,root,root) %dir %{_var}/spool/audit
 %attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz