diff --git a/cryptsetup.spec b/cryptsetup.spec
index 3bedde2..a1369bc 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -11,8 +11,8 @@ BuildRequires: libselinux-devel, python-devel
 Provides: cryptsetup-luks = %{version}-%{release}
 Obsoletes: cryptsetup-luks < 1.4.0
 Requires: cryptsetup-libs = %{version}-%{release}
+Conflicts: filesystem < 3
 
-%define _root_sbindir /sbin
 %define upstream_version %{version}
 Source0: http://cryptsetup.googlecode.com/files/cryptsetup-%{upstream_version}.tar.bz2
 
@@ -38,6 +38,7 @@ Group: System Environment/Libraries
 Summary: Cryptsetup shared library
 Provides: cryptsetup-luks-libs = %{version}-%{release}
 Obsoletes: cryptsetup-luks-libs < 1.4.0
+Conflicts: filesystem < 3
 
 %description libs
 This package contains the cryptsetup shared library, libcryptsetup.
@@ -58,7 +59,7 @@ for setting up disk encryption using dm-crypt kernel module.
 chmod -x python/pycryptsetup-test.py
 
 %build
-%configure  --sbindir=%{_root_sbindir} --libdir=/%{_lib} --enable-python
+%configure --enable-python
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -67,15 +68,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -rf  $RPM_BUILD_ROOT/%{_lib}/*.la $RPM_BUILD_ROOT/%{_lib}/cryptsetup
-
-# move libcryptsetup.so to %%{_libdir}
-pushd $RPM_BUILD_ROOT/%{_lib}
-rm libcryptsetup.so
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}
-ln -s ../../%{_lib}/$(ls libcryptsetup.so.?.?.?) $RPM_BUILD_ROOT/%{_libdir}/libcryptsetup.so
-mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT/%{_libdir}
-popd
+rm -rf  $RPM_BUILD_ROOT/%{_libdir}/*.la 
+
 %find_lang cryptsetup
 
 %post -n cryptsetup-libs -p /sbin/ldconfig
@@ -85,7 +79,7 @@ popd
 %files -f cryptsetup.lang
 %doc COPYING ChangeLog AUTHORS TODO FAQ
 %{_mandir}/man8/cryptsetup.8.gz
-%{_root_sbindir}/cryptsetup
+%{_sbindir}/cryptsetup
 
 %files devel
 %doc docs/examples/*
@@ -95,7 +89,7 @@ popd
 
 %files libs
 %doc COPYING
-/%{_lib}/libcryptsetup.so.*
+%{_libdir}/libcryptsetup.so.*
 
 %files python
 %doc COPYING.LGPL python/pycryptsetup-test.py