diff --git a/nspr.spec b/nspr.spec
index 672c92c..b856b15 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,10 +1,11 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
 Version:        4.9
-Release:        0.1%{?dist}.beta3
+Release:        0.1%{?dist}.beta3.0.usrmove.1
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
+Conflicts:      filesystem < 3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 # Sources available at ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/
@@ -101,7 +102,6 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                      $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
 %{__cp} ./config/nspr-config-pc $RPM_BUILD_ROOT/%{_bindir}/nspr-config
 
 # Get rid of the things we don't want installed (per upstream)
@@ -114,13 +114,6 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
    $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \
    $RPM_BUILD_ROOT/%{_includedir}/nspr4/md
 
-for file in libnspr4.so libplc4.so libplds4.so
-do
-  mv -f $RPM_BUILD_ROOT/%{_libdir}/$file $RPM_BUILD_ROOT/%{_lib}/$file
-  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
-
-
 %clean
 %{__rm} -Rf $RPM_BUILD_ROOT
 
@@ -130,15 +123,12 @@ done
 
 %files
 %defattr(-,root,root)
-/%{_lib}/libnspr4.so
-/%{_lib}/libplc4.so
-/%{_lib}/libplds4.so
-
-%files devel
-%defattr(-, root, root)
 %{_libdir}/libnspr4.so
 %{_libdir}/libplc4.so
 %{_libdir}/libplds4.so
+
+%files devel
+%defattr(-, root, root)
 %{_includedir}/nspr4
 %{_libdir}/pkgconfig/nspr.pc
 %{_bindir}/nspr-config