diff --git a/udisks.spec b/udisks.spec
index eda29a3..b2ad7fe 100644
--- a/udisks.spec
+++ b/udisks.spec
@@ -56,6 +56,7 @@ Requires: ntfsprogs
 
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
+Conflicts: filesystem < 3
 
 # Obsolete and Provide DeviceKit-disks - udisks provides exactly the same
 # ABI just with a different name and versioning-scheme
@@ -96,6 +97,13 @@ make
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# move stuff from / to /usr, it's hard-coded
+mkdir -p %{buildroot}%{_sbindir}
+mv -f %{buildroot}/sbin/umount.udisks %{buildroot}%{_sbindir}/ || :
+mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
+mv -f %{buildroot}/lib/udev/udisks-* %{buildroot}%{_prefix}/lib/udev/ || :
+mv -f %{buildroot}/lib/udev/rules.d/* %{buildroot}%{_prefix}/lib/udev/rules.d/ || :
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -117,13 +125,13 @@ chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh
 %{_sysconfdir}/avahi/services/udisks.service
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_sysconfdir}/profile.d/*.sh
-/lib/udev/rules.d/*.rules
+%{_prefix}/lib/udev/rules.d/*.rules
 
-/lib/udev/udisks-part-id
-/lib/udev/udisks-dm-export
-/lib/udev/udisks-probe-ata-smart
-/lib/udev/udisks-probe-sas-expander
-/sbin/umount.udisks
+%{_prefix}/lib/udev/udisks-part-id
+%{_prefix}/lib/udev/udisks-dm-export
+%{_prefix}/lib/udev/udisks-probe-ata-smart
+%{_prefix}/lib/udev/udisks-probe-sas-expander
+%{_sbindir}/umount.udisks
 
 %{_bindir}/*
 %{_libexecdir}/*