diff --git a/libcap-ng.spec b/libcap-ng.spec
index 396844c..b021db6 100644
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -11,6 +11,7 @@ Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-headers >= 2.6.11 
 BuildRequires: libattr-devel
+Conflicts: filesystem < 3
 
 %description
 Libcap-ng is a library that makes using posix capabilities easier
@@ -53,28 +54,18 @@ lets you set the file system based capabilities.
 %setup -q
 
 %build
-%configure --libdir=/%{_lib}
+%configure 
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR="${RPM_BUILD_ROOT}" install
 
-# Move the symlink
-rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.so
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-VLIBNAME=$(ls $RPM_BUILD_ROOT/%{_lib}/%{name}.so.*.*.*)
-LIBNAME=$(basename $VLIBNAME)
-ln -s ../../%{_lib}/$LIBNAME $RPM_BUILD_ROOT%{_libdir}/%{name}.so
-
-# Move the pkgconfig file
-mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
-
 # Remove a couple things so they don't get picked up
-rm -f $RPM_BUILD_ROOT/%{_lib}/libcap-ng.la
-rm -f $RPM_BUILD_ROOT/%{_lib}/libcap-ng.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_capng.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_capng.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libcap-ng.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libcap-ng.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/python?.?/site-packages/_capng.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/python?.?/site-packages/_capng.la
 
 %check
 make check
@@ -90,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-%attr(0755,root,root) /%{_lib}/libcap-ng.so.*
+%attr(0755,root,root) %{_libdir}/libcap-ng.so.*
 
 %files devel
 %defattr(-,root,root,-)