diff --git a/mozilla/security/jss/Makefile b/mozilla/security/jss/Makefile
index 54f1d0aeb6a..bd3e5b233ca 100644
--- a/mozilla/security/jss/Makefile
+++ b/mozilla/security/jss/Makefile
@@ -85,3 +85,17 @@ else
 	@echo "The \"nss_release.pl\" script may ONLY be used on OPTimized builds!!!" 
 endif
 
+
+#
+# The public NSS headers from an NSS binary release are now unpacked in
+# the mozilla/dist/public/nss directory; they were unpacked in the
+# mozilla/dist/public/security directory before.  If we build NSS from
+# source, NSS still installs its headers in mozilla/dist/public/security.
+# To allow JSS to work with either an NSS binary release or an NSS built
+# from source, we rename mozilla/dist/public/nss to
+# mozilla/dist/public/security after unpacking a binary release.
+#
+import::
+	rm -rf $(SOURCE_XP_DIR)/public/security
+	mv $(SOURCE_XP_DIR)/public/nss $(SOURCE_XP_DIR)/public/security
+
diff --git a/mozilla/security/jss/lib/config.mk b/mozilla/security/jss/lib/config.mk
index cd6378c8ba6..8caeddad732 100644
--- a/mozilla/security/jss/lib/config.mk
+++ b/mozilla/security/jss/lib/config.mk
@@ -43,10 +43,6 @@ SHARED_LIBRARY_DIRS = \
     ../org/mozilla/jss/util \
     $(NULL)
 
-EXTRA_LIBS += \
-    $(LIBDBM) \
-    $(NULL)
-
 ifeq ($(OS_ARCH),WINNT)
 
 SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
diff --git a/mozilla/security/jss/manifest.mn b/mozilla/security/jss/manifest.mn
index 67ac129a937..54bbc8d9e87 100644
--- a/mozilla/security/jss/manifest.mn
+++ b/mozilla/security/jss/manifest.mn
@@ -35,9 +35,8 @@ CORE_DEPTH = ..
  
 MODULE = jss
  
-IMPORTS =	security/NSS_3_2_RTM\
-			dbm/DBM_1_54 \
-			nspr20/v3.5.1 \
+IMPORTS =	nss/NSS_3_3_BETA \
+			nspr20/v4.1.2 \
 			$(NULL)
 
 DIRS =  org     \
diff --git a/mozilla/security/jss/org/mozilla/jss/crypto/manifest.mn b/mozilla/security/jss/org/mozilla/jss/crypto/manifest.mn
index 765e625b8fb..29446e5f526 100644
--- a/mozilla/security/jss/org/mozilla/jss/crypto/manifest.mn
+++ b/mozilla/security/jss/org/mozilla/jss/crypto/manifest.mn
@@ -37,7 +37,7 @@ MODULE = jss
 
 NS_USE_JDK = 1
 
-REQUIRES =      nspr20 dbm security
+REQUIRES =      nspr20 security
 
 PACKAGE =       org/mozilla/jss/crypto
 
diff --git a/mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.c b/mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.c
index e82b2ec5434..fb0bc37645b 100644
--- a/mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.c
+++ b/mozilla/security/jss/org/mozilla/jss/manage/CryptoManager.c
@@ -33,7 +33,6 @@
 #include "_jni/org_mozilla_jss_CryptoManager.h"
 
 #include <secitem.h>
-#include <mcom_db.h>
 #include <secmod.h>
 #include <cert.h>
 #include <certt.h>
@@ -57,19 +56,6 @@
 #include <signal.h>
 #endif
 
-/* HACK
- * Include this from cdbhdl.h since it's now a private export.
- * We only do this because we need to allocate memory for this so
- * we need its size.
- */
-struct CERTCertDBHandleStr {
-    DB *permCertDB;
-    DB *tempCertDB;
-    void *spkDigestInfo;
-    CERTStatusConfig *statusConfig;
-    PZMonitor *dbMon;
-};
-
 /********************************************************************/
 /* The following VERSION Strings should be updated in the following */
 /* files everytime a new release of JSS is generated:               */
diff --git a/mozilla/security/jss/org/mozilla/jss/manage/manifest.mn b/mozilla/security/jss/org/mozilla/jss/manage/manifest.mn
index 4ad7fd8e271..66a10bc6856 100644
--- a/mozilla/security/jss/org/mozilla/jss/manage/manifest.mn
+++ b/mozilla/security/jss/org/mozilla/jss/manage/manifest.mn
@@ -36,7 +36,7 @@ MODULE = jss
  
 NS_USE_JDK = 1
 
-REQUIRES =      nspr20 svrcore dbm security
+REQUIRES =      nspr20 security
 
 PACKAGE =       org/mozilla/jss
 
diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cert.c b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cert.c
index bf1c64b8ee9..3d674c3ffb7 100644
--- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cert.c
+++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11Cert.c
@@ -37,7 +37,6 @@
 #include <plarena.h>
 #include <seccomon.h>
 #include <secmodt.h>
-#include <mcom_db.h>
 #include <certt.h>
 #include <cert.h>
 #include <pk11func.h>
diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/manifest.mn b/mozilla/security/jss/org/mozilla/jss/pkcs11/manifest.mn
index 75860b19150..f77fb08bd26 100644
--- a/mozilla/security/jss/org/mozilla/jss/pkcs11/manifest.mn
+++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/manifest.mn
@@ -37,7 +37,7 @@ MODULE = jss
 
 NS_USE_JDK = 1
 
-REQUIRES =      nspr20 dbm security
+REQUIRES =      nspr20 security
 
 PACKAGE =       org/mozilla/jss/pkcs11
 
diff --git a/mozilla/security/jss/org/mozilla/jss/pkix/manifest.mn b/mozilla/security/jss/org/mozilla/jss/pkix/manifest.mn
index 3b3005e6921..0211add8a32 100644
--- a/mozilla/security/jss/org/mozilla/jss/pkix/manifest.mn
+++ b/mozilla/security/jss/org/mozilla/jss/pkix/manifest.mn
@@ -37,7 +37,7 @@ MODULE = jss
 
 NS_USE_JDK = 1
 
-REQUIRES =      nspr20 dbm security
+REQUIRES =      nspr20 security
 
 PACKAGE =       org/mozilla/jss/pkix
 
diff --git a/mozilla/security/jss/org/mozilla/jss/provider/manifest.mn b/mozilla/security/jss/org/mozilla/jss/provider/manifest.mn
index a94424e862d..2832e80de98 100644
--- a/mozilla/security/jss/org/mozilla/jss/provider/manifest.mn
+++ b/mozilla/security/jss/org/mozilla/jss/provider/manifest.mn
@@ -39,7 +39,7 @@ NS_USE_JDK = 1
 
 PACKAGE = org/mozilla/jss/provider
 
-REQUIRES =      nspr20 dbm security
+REQUIRES =      nspr20 security
 
 CLASSES = 											\
                     MD5MessageDigest                \
diff --git a/mozilla/security/jss/org/mozilla/jss/tests/manifest.mn b/mozilla/security/jss/org/mozilla/jss/tests/manifest.mn
index fc44b6392b8..b383d5c11f2 100644
--- a/mozilla/security/jss/org/mozilla/jss/tests/manifest.mn
+++ b/mozilla/security/jss/org/mozilla/jss/tests/manifest.mn
@@ -37,7 +37,7 @@ MODULE = jss
  
 NS_USE_JDK = 1
 
-REQUIRES =      nspr20 dbm security
+REQUIRES =      nspr20 security
 
 PRIVATE_CLASSES = 											\
                     DigestTest                              \
diff --git a/mozilla/security/jss/org/mozilla/jss/util/manifest.mn b/mozilla/security/jss/org/mozilla/jss/util/manifest.mn
index 990f3068afc..c100d035ced 100644
--- a/mozilla/security/jss/org/mozilla/jss/util/manifest.mn
+++ b/mozilla/security/jss/org/mozilla/jss/util/manifest.mn
@@ -37,7 +37,7 @@ MODULE = jss
 
 NS_USE_JDK = 1
 
-REQUIRES =      nspr20 dbm security
+REQUIRES =      nspr20 security
 
 PACKAGE =       org/mozilla/jss/util