diff --git a/libusb1.spec b/libusb1.spec
index 1a0c9cc..4b4c512 100644
--- a/libusb1.spec
+++ b/libusb1.spec
@@ -17,6 +17,7 @@ Source0: libusb-1.0.9-rc1.tar.bz2
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://libusb.wiki.sourceforge.net/Libusb1.0
+Conflicts: filesystem < 3
 BuildRequires: doxygen
 
 %description
@@ -56,7 +57,7 @@ This package contains static libraries to develop applications that use libusb1.
 %setup -q -n libusb-1.0.8
 
 %build
-%configure --libdir=/%{_lib}
+%configure
 make CFLAGS="$RPM_OPT_FLAGS"
 pushd doc
 make docs
@@ -64,14 +65,11 @@ popd
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_lib}/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 # Our snapshot reports itself as 1.0.8, change the pkg-config file version to
 # 1.0.9 so that configure checks by apps who need the new 1.0.9 succeed
-sed -i 's/1\.0\.8/1.0.9/' %{buildroot}/%{_lib}/pkgconfig/libusb-1.0.pc
-
-mkdir -p %{buildroot}%{_libdir}/pkgconfig
-mv %{buildroot}/%{_lib}/pkgconfig/* %{buildroot}%{_libdir}/pkgconfig/
+sed -i 's/1\.0\.8/1.0.9/' %{buildroot}/%{_libdir}/pkgconfig/libusb-1.0.pc
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -80,12 +78,12 @@ mv %{buildroot}/%{_lib}/pkgconfig/* %{buildroot}%{_libdir}/pkgconfig/
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README NEWS ChangeLog
-/%{_lib}/*.so.*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
-/%{_lib}/*.so
+%{_libdir}/*.so
 %{_libdir}/pkgconfig/libusb-1.0.pc
 
 %files devel-doc
@@ -94,7 +92,7 @@ mv %{buildroot}/%{_lib}/pkgconfig/* %{buildroot}%{_libdir}/pkgconfig/
 
 %files static
 %defattr(-,root,root)
-/%{_lib}/*.a
+%{_libdir}/*.a
 
 %changelog
 * Fri Sep 16 2011 Hans de Goede <hdegoede@redhat.com> - 1.0.9-0.3.rc1