diff --git a/libselinux.spec b/libselinux.spec
index eef2acf..16bb87f 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -7,7 +7,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.1.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -18,6 +18,7 @@ BuildRequires: python-devel ruby-devel ruby libsepol-static >= %{libsepolver} sw
 BuildRequires: python3-devel
 %endif # if with_python3
 Requires: libsepol >= %{libsepolver}
+Conflicts: filesystem < 3
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -151,7 +152,7 @@ InstallPythonWrapper %{__python}
 InstallPythonWrapper %{__python3}
 %endif # with_python3
 
-make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" BINDIR="%{buildroot}%{_sbindir}" install install-rubywrap
+make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}%{_libdir}" BINDIR="%{buildroot}%{_sbindir}" install install-rubywrap
 
 # Nuke the files we don't want to distribute
 rm -f %{buildroot}%{_sbindir}/compute_*
@@ -170,6 +171,10 @@ rm -f %{buildroot}%{_sbindir}/selinux_check_securetty_context
 mv %{buildroot}%{_sbindir}/getdefaultcon %{buildroot}%{_sbindir}/selinuxdefcon
 mv %{buildroot}%{_sbindir}/getconlist %{buildroot}%{_sbindir}/selinuxconlist
 
+# Move stuff from /lib, /sbin to /usr
+mv -f %{buildroot}/sbin/matchpathcon %{buildroot}%{_sbindir}/ || :
+mv -f %{buildroot}/%{_lib}/libselinux.so.1 %{buildroot}%{_libdir}/ || :
+
 %clean
 rm -rf %{buildroot}
 
@@ -179,9 +184,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-/%{_lib}/libselinux.so.*
+%{_libdir}/libselinux.so.*
 /var/run/setrans
-/sbin/matchpathcon
+%{_sbindir}/matchpathcon
 /etc/tmpfiles.d/libselinux.conf
 
 %files utils
@@ -189,7 +194,6 @@ rm -rf %{buildroot}
 %{_sbindir}/avcstat
 %{_sbindir}/getenforce
 %{_sbindir}/getsebool
-%{_sbindir}/matchpathcon
 %{_sbindir}/selinuxconlist
 %{_sbindir}/selinuxdefcon
 %{_sbindir}/selinuxexeccon
@@ -231,6 +235,10 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 2.1.9-4
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Mon Jan 23 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.9-3
 - Add Dan Berrange code cleanup patches.