diff --git a/xfsprogs.spec b/xfsprogs.spec
index 469dff8..e218335 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -17,6 +17,8 @@ BuildRequires:	readline-devel, libblkid-devel >= 2.17-0.1.git5e51568
 Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
 Conflicts:	xfsdump < 3.0.1
+Conflicts:	filesystem < 3
+Provides:       /sbin/fsck.xfs
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -77,12 +79,13 @@ make V=1 %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make V=1 DIST_ROOT=$RPM_BUILD_ROOT install install-dev install-qa
 
+# move to /usr/{sbin,lib}, /{sbin,lib} is hard-coded
+mv -f %{buildroot}/sbin/* %{buildroot}%{_sbindir}/ || :
+mv -f %{buildroot}/%{_lib}/libhandle.* %{buildroot}%{_libdir}/ || :
+
 # nuke .la files, etc
-rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.{la,a}}
-# fix up symlink to be correct
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
-ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
-chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libhandle.so.*.*.*
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.{la,a}
+chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libhandle.so.*.*.*
 
 # remove non-versioned docs location
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
@@ -108,13 +111,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc doc/CHANGES doc/COPYING doc/CREDITS README
-/sbin/fsck.xfs
-/sbin/mkfs.xfs
-/sbin/xfs_repair
-/%{_lib}/*.so.*
+%{_sbindir}/fsck.xfs
+%{_sbindir}/mkfs.xfs
+%{_sbindir}/xfs_*
+%{_libdir}/*.so.*
 %{_mandir}/man8/*
 %{_mandir}/man5/*
-%{_sbindir}/*
 
 %files devel
 %defattr(-,root,root)