diff --git a/libgcrypt.spec b/libgcrypt.spec
index 3b97384..42201e7 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -31,6 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gawk, libgpg-error-devel >= 1.4, pkgconfig
 BuildRequires: fipscheck
 Group: System Environment/Libraries
+Conflicts: filesystem < 3
 
 %package devel
 Summary: Development files for the %{name} package
@@ -82,7 +83,7 @@ make check
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    fipshmac $RPM_BUILD_ROOT/%{_lib}/*.so.?? \
+    fipshmac $RPM_BUILD_ROOT%{_libdir}/*.so.?? \
 %{nil}
 
 %install
@@ -97,36 +98,6 @@ sed -i -e 's,^libdir="/usr/lib.*"$,libdir="/usr/lib",g' $RPM_BUILD_ROOT/%{_bindi
 rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
 
-# Relocate the shared libraries to /%{_lib}.
-mkdir -p $RPM_BUILD_ROOT/%{_lib}
-for shlib in $RPM_BUILD_ROOT/%{_libdir}/*.so* ; do
-	if test -L "$shlib" ; then
-		rm "$shlib"
-	else
-		mv "$shlib" $RPM_BUILD_ROOT/%{_lib}/
-	fi
-done
-
-# Figure out where /%{_lib} is relative to %{_libdir}.
-touch $RPM_BUILD_ROOT/root_marker
-relroot=..
-while ! test -f $RPM_BUILD_ROOT/%{_libdir}/$relroot/root_marker ; do
-	relroot=$relroot/..
-done
-
-# Overwrite development symlinks.
-pushd $RPM_BUILD_ROOT/%{_libdir}
-for shlib in $relroot/%{_lib}/lib*.so.* ; do
-	shlib=`echo "$shlib" | sed -e 's,//,/,g'`
-	target=`basename "$shlib" | sed -e 's,\.so.*,,g'`.so
-	ln -sf $shlib $target
-done
-popd
-
-# Add soname symlink.
-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}/
-rm -f $RPM_BUILD_ROOT/root_marker
-
 # Create /etc/gcrypt (hardwired, not dependent on the configure invocation) so
 # that _someone_ owns it.
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/gcrypt
@@ -152,8 +123,8 @@ exit 0
 %files
 %defattr(-,root,root,-)
 %dir /etc/gcrypt
-/%{_lib}/libgcrypt.so.*
-/%{_lib}/.libgcrypt.so.*.hmac
+%{_libdir}/libgcrypt.so.*
+%{_libdir}/.libgcrypt.so.*.hmac
 %doc COPYING.LIB AUTHORS NEWS THANKS
 
 %files devel