diff --git a/mozilla/security/jss/org/mozilla/jss/CryptoManager.c b/mozilla/security/jss/org/mozilla/jss/CryptoManager.c
index 3dd11fd7d34..b9f479acce8 100644
--- a/mozilla/security/jss/org/mozilla/jss/CryptoManager.c
+++ b/mozilla/security/jss/org/mozilla/jss/CryptoManager.c
@@ -49,6 +49,7 @@
 #include <jssutil.h>
 #include <java_ids.h>
 #include <jss_exceptions.h>
+#include <jssver.h>
 
 #include "pk11util.h"
 
@@ -65,10 +66,9 @@
 /*                                                                  */
 /********************************************************************/
 
-static const char* DLL_JSS_VERSION     = "JSS_VERSION = JSS_3_2";
-static const char* DLL_JDK_VERSION     = "JDK_VERSION = JDK 1.2.2";
-static const char* DLL_NSS_VERSION     = "NSS_VERSION = NSS_3_4_1_RTM";
-static const char* DLL_NSPR_VERSION    = "NSPR_VERSION = NSPRPUB_RELEASE_4_2";
+static const char* DLL_JSS_VERSION     = "JSS_VERSION = " JSS_VERSION;
+static const char* DLL_NSS_VERSION     = "NSS_VERSION = " NSS_VERSION;
+static const char* DLL_NSPR_VERSION    = "NSPR_VERSION = " PR_VERSION;
 
 static jobject
 makePWCBInfo(JNIEnv *env, PK11SlotInfo *slot);
diff --git a/mozilla/security/jss/org/mozilla/jss/CryptoManager.java b/mozilla/security/jss/org/mozilla/jss/CryptoManager.java
index 52eb0514185..7695470b1f2 100644
--- a/mozilla/security/jss/org/mozilla/jss/CryptoManager.java
+++ b/mozilla/security/jss/org/mozilla/jss/CryptoManager.java
@@ -52,7 +52,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.7 $ $Date: 2002-05-23 18:45:00 $ 
+ * @version $Revision: 1.8 $ $Date: 2002-07-03 23:46:02 $ 
  */
 public final class CryptoManager implements TokenSupplier
 {
@@ -1299,7 +1299,7 @@ public final class CryptoManager implements TokenSupplier
     public static final String
     JAR_JDK_VERSION     = "JDK_VERSION = N/A";
     public static final String
-    JAR_NSS_VERSION     = "NSS_VERSION = NSS_3_4_1_RTM";
+    JAR_NSS_VERSION     = "NSS_VERSION = NSS_3_4_2_RTM";
     public static final String
     JAR_DBM_VERSION     = "DBM_VERSION = N/A";
     public static final String