diff --git a/compat-db.spec b/compat-db.spec
index 0f457dc..e13a8d4 100644
--- a/compat-db.spec
+++ b/compat-db.spec
@@ -44,6 +44,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: compat-db45%{?_isa} = %{db45_version}-%{release}
 Requires: compat-db46%{?_isa} = %{db46_version}-%{release}
 Requires: compat-db47%{?_isa} = %{db47_version}-%{release}
+Conflicts: filesystem < 3
 
 %description
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -73,6 +74,7 @@ Obsoletes: db3, db3-devel, db3-utils
 Obsoletes: db31, db32, db3x
 Obsoletes: db4 < 4.5, db4-devel < 4.5, db4-utils < 4.5, db4-tcl < 4.5, db4-java < 4.5
 Obsoletes: compat-db < 4.6.21-5
+Conflicts: filesystem < 3
 
 %description -n compat-db45
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -90,6 +92,7 @@ Obsoletes: db3, db3-devel, db3-utils
 Obsoletes: db31, db32, db3x
 Obsoletes: db4 < 4.6, db4-devel < 4.6, db4-utils < 4.6, db4-tcl < 4.6, db4-java < 4.6
 Obsoletes: compat-db < 4.6.21-5
+Conflicts: filesystem < 3
 
 %description -n compat-db46
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -107,6 +110,7 @@ Obsoletes: db3, db3-devel, db3-utils
 Obsoletes: db31, db32, db3x
 Obsoletes: db4 < 4.7, db4-devel < 4.7, db4-utils < 4.7, db4-tcl < 4.7, db4-java < 4.7
 Obsoletes: compat-db < 4.6.21-5
+Conflicts: filesystem < 3
 
 %description -n compat-db47
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -210,20 +214,11 @@ chmod u+w ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_bindir}/*
 for version in %{db4_versions} ; do
 	mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/db${version}
 	pushd ${RPM_BUILD_ROOT}/%{_libdir}/db${version}
-	ln -s ../../../%{_lib}/libdb-`echo ${version} | cut -b 1-3`.so libdb.so
-	ln -s ../../../%{_lib}/libdb_cxx-`echo ${version} | cut -b 1-3`.so libdb_cxx.so
+	ln -s ../../../%{_libdir}/libdb-`echo ${version} | cut -b 1-3`.so libdb.so
+	ln -s ../../../%{_libdir}/libdb_cxx-`echo ${version} | cut -b 1-3`.so libdb_cxx.so
 	popd
 done
 
-
-# On Linux systems, move the shared libraries to lib directory.
-%ifos linux
-if [ "%{_libdir}" != "%{_lib}" ]; then
-	mkdir -p ${RPM_BUILD_ROOT}/%{_lib}
-	mv ${RPM_BUILD_ROOT}%{_libdir}/libdb*?.?.so* ${RPM_BUILD_ROOT}/%{_lib}/
-fi
-%endif
-
 # Remove unpackaged files.
 rm -fr ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -fr ${RPM_BUILD_ROOT}%{_prefix}/docs/
@@ -250,13 +245,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc docs/db-%{db45_version}
 %{_bindir}/db45*
 %{_bindir}/berkeley_db45_svc
-%ifos linux
-/%{_lib}/libdb-4.5.so
-/%{_lib}/libdb_cxx-4.5.so
-%else
 %{_libdir}/libdb-4.5.so
 %{_libdir}/libdb_cxx-4.5.so
-%endif
 %{_libdir}/db%{db45_version}
 
 %files -n compat-db46
@@ -264,13 +254,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc docs/db-%{db46_version}
 %{_bindir}/db46*
 %{_bindir}/berkeley_db46_svc
-%ifos linux
-/%{_lib}/libdb-4.6.so
-/%{_lib}/libdb_cxx-4.6.so
-%else
 %{_libdir}/libdb-4.6.so
 %{_libdir}/libdb_cxx-4.6.so
-%endif
 %{_libdir}/db%{db46_version}
 
 %files -n compat-db47
@@ -278,13 +263,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc docs/db-%{db47_version}
 %{_bindir}/db47*
 %{_bindir}/berkeley_db47_svc
-%ifos linux
-/%{_lib}/libdb-4.7.so
-/%{_lib}/libdb_cxx-4.7.so
-%else
 %{_libdir}/libdb-4.7.so
 %{_libdir}/libdb_cxx-4.7.so
-%endif
 %{_libdir}/db%{db47_version}
 
 %changelog