diff --git a/krb5.spec b/krb5.spec
index 68b5d99..412cf02 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -116,6 +116,7 @@ to install this package.
 %package libs
 Summary: The shared libraries used by Kerberos 5
 Group: System Environment/Libraries
+Conflicts: filesystem < 3
 
 %description libs
 Kerberos is a network authentication system. The krb5-libs package
@@ -411,21 +412,6 @@ make -C src DESTDIR=$RPM_BUILD_ROOT EXAMPLEDIR=%{_docdir}/krb5-libs-%{version}/e
 # list of link flags, and it helps prevent file conflicts on multilib systems.
 sed -r -i -e 's|^libdir=/usr/lib(64)?$|libdir=/usr/lib|g' $RPM_BUILD_ROOT%{_bindir}/krb5-config
 
-# Move specific libraries from %{_libdir} to /%{_lib}, and fixup the symlinks.
-touch $RPM_BUILD_ROOT/rootfile
-rellibdir=..
-while ! test -r $RPM_BUILD_ROOT/%{_libdir}/${rellibdir}/rootfile ; do
-	rellibdir=../${rellibdir}
-done
-rm -f $RPM_BUILD_ROOT/rootfile
-mkdir -p $RPM_BUILD_ROOT/%{_lib}
-for library in libgssapi_krb5 libgssrpc libk5crypto libkrb5 libkrb5support ; do
-	mv $RPM_BUILD_ROOT/%{_libdir}/${library}.so.* $RPM_BUILD_ROOT/%{_lib}/
-	pushd $RPM_BUILD_ROOT/%{_libdir}
-	ln -fs ${rellibdir}/%{_lib}/${library}.so.*.* ${library}.so
-	popd
-done
-
 # A sanity checker for upgrades.
 install -m 755 kdb_check_weak $RPM_BUILD_ROOT/%{_libdir}/krb5/
 
@@ -639,14 +625,14 @@ exit 0
 /%{_mandir}/man1/kerberos.1*
 /%{_mandir}/man5/.k5login.5*
 /%{_mandir}/man5/krb5.conf.5*
-/%{_lib}/libgssapi_krb5.so.*
-/%{_lib}/libgssrpc.so.*
-/%{_lib}/libk5crypto.so.*
+%{_libdir}/libgssapi_krb5.so.*
+%{_libdir}/libgssrpc.so.*
+%{_libdir}/libk5crypto.so.*
 %{_libdir}/libkadm5clnt_mit.so.*
 %{_libdir}/libkadm5srv_mit.so.*
 %{_libdir}/libkdb5.so.*
-/%{_lib}/libkrb5.so.*
-/%{_lib}/libkrb5support.so.*
+%{_libdir}/libkrb5.so.*
+%{_libdir}/libkrb5support.so.*
 %dir %{_libdir}/krb5
 %dir %{_libdir}/krb5/plugins
 %dir %{_libdir}/krb5/plugins/*