diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 9241b43..5c2e0d9 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -57,6 +57,7 @@ BuildRequires: openssl-devel flex bison python-devel doxygen glibc-static
 Requires: initscripts
 Requires(post): chkconfig
 Requires(preun): chkconfig /sbin/service
+Conflicts: filesystem < 3
 
 %description
 The iscsi package provides the server daemon for the iSCSI protocol,
@@ -120,7 +121,7 @@ popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/sbin
+mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/iscsi
@@ -140,7 +141,7 @@ mkdir -p $RPM_BUILD_ROOT%{python_sitearch}
 
 
 
-install -p -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
+install -p -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/%{_sbindir}
 install -p -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -p -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -p -m 644 etc/iscsid.conf $RPM_BUILD_ROOT%{_sysconfdir}/iscsi
@@ -148,7 +149,7 @@ install -p -m 644 doc/iscsistart.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -p -m 644 doc/iscsi-iname.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -p -m 644 iscsiuio/docs/iscsiuio.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install -p -m 644 iscsiuio/iscsiuiolog $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -p -m 755 iscsiuio/src/unix/iscsiuio $RPM_BUILD_ROOT/sbin
+install -p -m 755 iscsiuio/src/unix/iscsiuio $RPM_BUILD_ROOT/%{_sbindir}
 
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/iscsid
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/iscsi
@@ -172,7 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 if [ "$1" -eq "1" ]; then
 	if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ]; then
-		echo "InitiatorName=`/sbin/iscsi-iname`" > %{_sysconfdir}/iscsi/initiatorname.iscsi
+		echo "InitiatorName=`%{_sbindir}/iscsi-iname`" > %{_sysconfdir}/iscsi/initiatorname.iscsi
 	fi
 	/sbin/chkconfig --add iscsid
 	/sbin/chkconfig --add iscsi
@@ -216,7 +217,7 @@ fi
 %{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi
 %dir %{_sysconfdir}/iscsi
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
-/sbin/*
+%{_sbindir}/*
 %{_libdir}/libiscsi.so.0
 %{python_sitearch}/libiscsimodule.so
 %{_mandir}/man8/*