diff --git a/security/jss/lib/jss.def b/security/jss/lib/jss.def
index 53bb55ffed0..09336f029d1 100644
--- a/security/jss/lib/jss.def
+++ b/security/jss/lib/jss.def
@@ -291,7 +291,7 @@ Java_org_mozilla_jss_ssl_SSLServerSocket_abortAccept;
 ;+    local:
 ;+       *;
 ;+};
-;+JSS_4.1.1 {       # JSS 4.1.1 release
+;+JSS_4.2 {       # JSS 4.2 release
 ;+    global:
 Java_org_mozilla_jss_ssl_SocketBase_getSSLOption;
 Java_org_mozilla_jss_ssl_SSLSocket_getSSLDefaultOption;
diff --git a/security/jss/lib/manifest.mn b/security/jss/lib/manifest.mn
index 4457457411c..faa42083954 100644
--- a/security/jss/lib/manifest.mn
+++ b/security/jss/lib/manifest.mn
@@ -54,4 +54,6 @@ MODULE = jss
 NS_USE_JDK = 1
 
 LIBRARY_NAME = jss
+#/* LIBRARY_VERSION=JSS_VMAJOR so you only update when */
+#/* you update the JSS_VMAJOR                          */ 
 LIBRARY_VERSION = 4
diff --git a/security/jss/org/mozilla/jss/CryptoManager.c b/security/jss/org/mozilla/jss/CryptoManager.c
index 997d8aa5cdc..77b4829c56f 100644
--- a/security/jss/org/mozilla/jss/CryptoManager.c
+++ b/security/jss/org/mozilla/jss/CryptoManager.c
@@ -71,10 +71,16 @@
 /*                                                                  */
 /********************************************************************/
 
+/* JSS_VERSION from  mozilla/security/jss/org/mozilla/jss/util/jssver.h */
 static const char* DLL_JSS_VERSION     = "JSS_VERSION = " JSS_VERSION;
+/* NSS_VERSION from mozilla/security/nss/lib/nss/nss.h */
 static const char* DLL_NSS_VERSION     = "NSS_VERSION = " NSS_VERSION;
+/* NSPR_version from mozilla/nsprpub/pr/include/prinit.h */
 static const char* DLL_NSPR_VERSION    = "NSPR_VERSION = " PR_VERSION;
 
+
+
+
 static jobject
 makePWCBInfo(JNIEnv *env, PK11SlotInfo *slot);
 
diff --git a/security/jss/org/mozilla/jss/CryptoManager.java b/security/jss/org/mozilla/jss/CryptoManager.java
index d0cba3fca17..360eb5a8775 100644
--- a/security/jss/org/mozilla/jss/CryptoManager.java
+++ b/security/jss/org/mozilla/jss/CryptoManager.java
@@ -56,7 +56,7 @@ import org.mozilla.jss.provider.java.security.JSSMessageDigestSpi;
  * Initialization is done with static methods, and must be done before
  * an instance can be created.  All other operations are done with instance
  * methods.
- * @version $Revision: 1.37 $ $Date: 2005-10-28 04:21:08 $
+ * @version $Revision: 1.38 $ $Date: 2005-11-04 23:16:42 $
  */
 public final class CryptoManager implements TokenSupplier
 {
@@ -1316,11 +1316,11 @@ public final class CryptoManager implements TokenSupplier
 
 
     public static final String
-    JAR_JSS_VERSION     = "JSS_VERSION = JSS_4_1_1_RTM";
+    JAR_JSS_VERSION     = "JSS_VERSION = JSS_4_2_BETA";
     public static final String
     JAR_JDK_VERSION     = "JDK_VERSION = N/A";
     public static final String
-    JAR_NSS_VERSION     = "NSS_VERSION = NSS_3_9_RTM";
+    JAR_NSS_VERSION     = "NSS_VERSION = NSS_3_11_RTM";
     public static final String
     JAR_DBM_VERSION     = "DBM_VERSION = N/A";
     public static final String
diff --git a/security/jss/org/mozilla/jss/JSSProvider.java b/security/jss/org/mozilla/jss/JSSProvider.java
index 001820b3eac..53f571bcf12 100644
--- a/security/jss/org/mozilla/jss/JSSProvider.java
+++ b/security/jss/org/mozilla/jss/JSSProvider.java
@@ -52,8 +52,8 @@ public final class JSSProvider extends java.security.Provider {
     /********************************************************************/
 
     private static int JSS_MAJOR_VERSION  = 4;
-    private static int JSS_MINOR_VERSION  = 1;
-    private static int JSS_PATCH_VERSION  = 1;
+    private static int JSS_MINOR_VERSION  = 2;
+    private static int JSS_PATCH_VERSION  = 0;
     private static double JSS_VERSION     = round((double)(JSS_MAJOR_VERSION +
                                              (double)JSS_MINOR_VERSION/10),2);
 
diff --git a/security/jss/org/mozilla/jss/util/jssver.h b/security/jss/org/mozilla/jss/util/jssver.h
index 1bccf4668b0..bbdf75aed89 100644
--- a/security/jss/org/mozilla/jss/util/jssver.h
+++ b/security/jss/org/mozilla/jss/util/jssver.h
@@ -57,10 +57,10 @@
 /*                                                                  */
 /********************************************************************/
 
-#define JSS_VERSION  "4.1.1"
+#define JSS_VERSION  "4.2"
 #define JSS_VMAJOR   4
-#define JSS_VMINOR   1
-#define JSS_VPATCH   1
-#define JSS_BETA     PR_FALSE
+#define JSS_VMINOR   2
+#define JSS_VPATCH   0
+#define JSS_BETA     PR_TRUE
 
 #endif