diff --git a/readahead.spec b/readahead.spec
index 9d93ad4..56d3bc8 100644
--- a/readahead.spec
+++ b/readahead.spec
@@ -13,6 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(preun):  /sbin/chkconfig, /sbin/service
 Requires:       procps /bin/gawk upstart /usr/bin/ionice
+Conflicts:      filesystem < 3
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  audit-libs-devel
 BuildRequires:  libblkid-devel
@@ -29,12 +30,15 @@ needed. Its goal is to speed up the boot process.
 %setup -q
 
 %build
-%configure --sbindir=/sbin
+%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=${RPM_BUILD_ROOT}
+# move to /usr, fix hard-coded path
+mkdir -p %{buildroot}%{_prefix}/lib/readahead
+mv -f %{buildroot}/lib/readahead/* %{buildroot}%{_prefix}/lib/readahead || :
 mkdir -p ${RPM_BUILD_ROOT}%{pkgvardatadir}
 %find_lang %{name}
 
@@ -72,17 +76,17 @@ fi
 %{_sysconfdir}/init/readahead.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/readahead
 %config(noreplace) %{_sysconfdir}/readahead.conf
-/sbin/readahead
-/sbin/readahead-collector
-%dir /lib/readahead
-/lib/readahead/readahead-collect.sh
-/lib/readahead/readahead-replay.sh
-/lib/readahead/readahead-sort.sh
-/lib/systemd/system/readahead-collect.service
-/lib/systemd/system/readahead-replay.service
-/lib/systemd/system/readahead-sort.service
-/lib/systemd/system/default.target.wants/readahead-collect.service
-/lib/systemd/system/default.target.wants/readahead-replay.service
+%{_sbindir}/readahead
+%{_sbindir}/readahead-collector
+%dir %{_prefix}/lib/readahead
+%{_prefix}/lib/readahead/readahead-collect.sh
+%{_prefix}/lib/readahead/readahead-replay.sh
+%{_prefix}/lib/readahead/readahead-sort.sh
+%{_unitdir}/readahead-collect.service
+%{_unitdir}/readahead-replay.service
+%{_unitdir}/readahead-sort.service
+%{_unitdir}/default.target.wants/readahead-collect.service
+%{_unitdir}/default.target.wants/readahead-replay.service
 
 %changelog
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.5.7-3