diff --git a/keyutils.spec b/keyutils.spec
index 1a18a2e..35ae77a 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -1,8 +1,6 @@
 %define vermajor 1
 %define verminor 5.2
 %define version %{vermajor}.%{verminor}
-%define libdir /%{_lib}
-%define usrlibdir %{_prefix}/%{_lib}
 %define libapivermajor 1
 %define libapiversion %{libapivermajor}.4
 
@@ -19,6 +17,7 @@ Source0: http://people.redhat.com/~dhowells/keyutils/keyutils-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glibc-kernheaders >= 2.4-9.1.92
+Conflicts: filesystem < 3
 
 %description
 Utilities to control the kernel key management facility and to provide
@@ -28,6 +27,7 @@ instantiated.
 %package libs
 Summary: Key utilities library
 Group: System Environment/Base
+Conflicts: filesystem < 3
 
 %description libs
 This package provides a wrapper library for the key management facility system
@@ -47,8 +47,10 @@ This package provides headers and libraries for building key utilities.
 %build
 make \
 	NO_ARLIB=1 \
-	LIBDIR=%{libdir} \
-	USRLIBDIR=%{usrlibdir} \
+	LIBDIR=%{_libdir} \
+	USRLIBDIR=%{_libdir} \
+	SBINDIR=%{_sbindir} \
+	BINDIR=%{_bindir} \
 	RELEASE=.%{release} \
 	NO_GLIBC_KEYERR=1 \
 	CFLAGS="-Wall $RPM_OPT_FLAGS -Werror"
@@ -58,8 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 make \
 	NO_ARLIB=1 \
 	DESTDIR=$RPM_BUILD_ROOT \
-	LIBDIR=%{libdir} \
-	USRLIBDIR=%{usrlibdir} \
+	LIBDIR=%{_libdir} \
+	USRLIBDIR=%{_libdir} \
+	SBINDIR=%{_sbindir} \
+	BINDIR=%{_bindir} \
 	install
 
 %clean
@@ -71,8 +75,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README LICENCE.GPL
-/sbin/*
-/bin/*
+%{_sbindir}/*
+%{_bindir}/*
 /usr/share/keyutils
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -82,12 +86,12 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(-,root,root,-)
 %doc LICENCE.LGPL
-%{libdir}/libkeyutils.so.%{libapiversion}
-%{libdir}/libkeyutils.so.%{libapivermajor}
+%{_libdir}/libkeyutils.so.%{libapiversion}
+%{_libdir}/libkeyutils.so.%{libapivermajor}
 
 %files libs-devel
 %defattr(-,root,root,-)
-%{usrlibdir}/libkeyutils.so
+%{_libdir}/libkeyutils.so
 %{_includedir}/*
 %{_mandir}/man3/*