diff --git a/build/package/rpm/SOURCES/mozilla-psm-exclude-list b/build/package/rpm/SOURCES/mozilla-psm-exclude-list
new file mode 100644
index 00000000000..3983568b2d9
--- /dev/null
+++ b/build/package/rpm/SOURCES/mozilla-psm-exclude-list
@@ -0,0 +1,4 @@
+libnss3.so
+libsmime3.so
+libsoftokn3.so
+libssl3.so
diff --git a/build/package/rpm/SPECS/mozilla-DATE.spec.in b/build/package/rpm/SPECS/mozilla-DATE.spec.in
index 98a022d665a..aab5f879cac 100644
--- a/build/package/rpm/SPECS/mozilla-DATE.spec.in
+++ b/build/package/rpm/SPECS/mozilla-DATE.spec.in
@@ -21,6 +21,7 @@ Source12:    mozilla-mail.desktop
 Source13:    mozilla-mail-icon.gif
 Source14:    mozilla-compose.desktop
 Source15:    mozilla-compose-icon.gif
+Source17:    mozilla-psm-exclude-list
 Source18:    mozilla-xpcom-exclude-list
 Source19:    mozilla-redhat-default-bookmarks.html
 Source20:    mozilla-1.2.1-xft-prefs.js
@@ -245,11 +246,18 @@ BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
 
 pushd .
 cd $RPM_BUILD_ROOT%{_libdir}/mozilla-%{version}
-# copy nspr
+# move nspr
 mv -v \
   libnspr4.so libplc4.so libplds4.so \
   $RPM_BUILD_ROOT%{_libdir}/
 
+# move psm
+mv -v \
+  libnss3.so libsmime3.so libsoftokn3.so libssl3.so \
+  $RPM_BUILD_ROOT%{_libdir}/
+
+# libnssckbi.so must be in both places
+cp -v libnssckbi.so $RPM_BUILD_ROOT%{_libdir}/
 popd
 
 /bin/rm -f %{builddir}/mozilla-nspr.list
@@ -264,6 +272,9 @@ popd
     --install-dir $RPM_BUILD_ROOT/%{_libdir} \
     --install-root %{_libdir}
 
+# manually add the libnssckbi.so file
+echo %{_libdir}/mozilla-%{version}/libnssckbi.so >> %{builddir}/mozilla-nss.list
+
 # build all of the default browser components
 # base mozilla package (mozilla.list)
 %{SOURCE7} --package langenus --output-file %{builddir}/mozilla.list \
@@ -303,6 +314,7 @@ popd
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
     --install-dir $RPM_BUILD_ROOT/%{_libdir}/mozilla-%{version} \
     --install-root %{_libdir}/mozilla-%{version} \
+    --exclude-file=%{SOURCE17}
 
 # mozilla chat (mozilla-chat.list)
 %{SOURCE7} --package chatzilla --output-file %{builddir}/mozilla-chat.list \