diff --git a/packaging/nss.spec b/packaging/nss.spec
-index 146efe7..475326f 100644
+index 146efe7..45866aa 100644
--- a/packaging/nss.spec
+++ b/packaging/nss.spec
@@ -135,8 +135,8 @@ FREEBL_NO_DEPEND=1
%ifarch x86_64 ppc64 ia64 s390x sparc64
USE_64=1
-@@ -165,9 +165,79 @@ export USE_64
+@@ -165,9 +165,82 @@ export USE_64
# NSS_ENABLE_ECC=1
# export NSS_ENABLE_ECC
+%{__make} -C ./mozilla/security/coreconf \
+ MOZILLA_CLIENT=1 \
+ BUILD_OPT=1 \
++ OS_ARCH="Linux" \
+ SKIP_SHLIBSIGN=1 \
+ OS_TARGET="Linux" \
+ OS_TARGET_RELEASE="3.1" \
+
+
+%{__make} -C ./mozilla/security/dbm \
-+ MOZILLA_CLIENT=1 \
++ MOZILLA_CLIENT=1\
+ BUILD_OPT=1 \
++ OS_ARCH="Linux" \
+ SKIP_SHLIBSIGN=1 \
+ OS_TARGET="Linux" \
+ OS_TARGET_RELEASE="3.1" \
+%{__make} -C ./mozilla/security/nss \
+ MOZILLA_CLIENT=1 \
+ BUILD_OPT=1 \
++ OS_ARCH=Linux \
+ SKIP_SHLIBSIGN=1 \
+ OS_TARGET="Linux" \
+ OS_TARGET_RELEASE="3.1" \
# enable the following line to force a test failure
+@@ -191,7 +264,8 @@ if [ SPACEISBAD -ne 0 ]; then
+ fi
+ MYRAND=`perl -e 'print 9000 + int rand 1000'`; echo $MYRAND ||:
+ RANDSERV=selfserv_${MYRAND}; echo $RANDSERV ||:
+-DISTBINDIR=`ls -d ./mozilla/dist/*.OBJ/bin`; echo $DISTBINDIR ||:
++Linux_XXX_OBJ=`ls mozilla/dist/ | grep '.OBJ'`
++DISTBINDIR=`ls -d ./mozilla/dist/${Linux_XXX_OBJ}/bin`; echo $DISTBINDIR ||:
+ pushd `pwd`
+ cd $DISTBINDIR
+ ln -s selfserv $RANDSERV
+@@ -272,12 +346,14 @@ install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh
+ %{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
+ %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+
++Linux_XXX_OBJ=`ls mozilla/dist/ | grep '.OBJ'`
++
+ # Copy the binary libraries we want
+ for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
+- libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so \
+- libnsssysinit.so
++ libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
++# libnsssysinit.so
+ do
+- %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
++ %{__install} -m 755 mozilla/dist/${Linux_XXX_OBJ}/lib/$file $RPM_BUILD_ROOT/%{_lib}
+ ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
+ done
+
+@@ -301,22 +377,24 @@ done
+ %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
+ %{__install} -m 644 %{SOURCE11} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
+
++
++
+ # Copy the development libraries we want
+ for file in libcrmf.a libnssb.a libnssckfw.a
+ do
+- %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
++ %{__install} -m 644 mozilla/dist/${Linux_XXX_OBJ}/lib/$file $RPM_BUILD_ROOT/%{_libdir}
+ done
+
+ # Copy the binaries we want
+ for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap
+ do
+- %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
++ %{__install} -m 755 mozilla/dist/${Linux_XXX_OBJ}/bin/$file $RPM_BUILD_ROOT/%{_bindir}
+ done
+
+ # Copy the binaries we ship as unsupported
+ for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
+ do
+- %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
++ %{__install} -m 755 mozilla/dist/${Linux_XXX_OBJ}/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
+ done
+
+ # Copy the include files we want
+@@ -369,7 +447,7 @@ done
+ %files sysinit
+ %manifest nss.manifest
+ %defattr(-,root,root)
+-/%{_lib}/libnsssysinit.so
++#/%{_lib}/libnsssysinit.so
+ %config(noreplace) %{_sysconfdir}/pki/nssdb/cert9.db
+ %config(noreplace) %{_sysconfdir}/pki/nssdb/key4.db
+ %config(noreplace) %{_sysconfdir}/pki/nssdb/pkcs11.txt
+@@ -417,7 +495,7 @@ done
+ %{_libdir}/libsoftokn3.chk
+ %{_libdir}/libnssckbi.so
+ %{_libdir}/libnsspem.so
+-%{_libdir}/libnsssysinit.so
++#%{_libdir}/libnsssysinit.so
+ %{_libdir}/libfreebl3.so
+ %{_libdir}/libfreebl3.chk
+ %{_libdir}/libcrmf.a