diff --git a/extensions/psm-glue/src/Makefile.in b/extensions/psm-glue/src/Makefile.in
index a580e72d2fda..f7a0e2dd107b 100644
--- a/extensions/psm-glue/src/Makefile.in
+++ b/extensions/psm-glue/src/Makefile.in
@@ -42,6 +42,7 @@ CPPSRCS	= \
 	nsSSLIOLayer.cpp \
 	nsSecureBrowserUIImpl.cpp \
 	nsSDR.cpp \
+	nsCrypto.cpp \
 	$(NULL)
 
 CSRCS = \
diff --git a/extensions/psm-glue/src/makefile.win b/extensions/psm-glue/src/makefile.win
index 825877b7e8c3..43ec3e05a9a8 100644
--- a/extensions/psm-glue/src/makefile.win
+++ b/extensions/psm-glue/src/makefile.win
@@ -48,6 +48,7 @@ LLIBS   = \
     $(DIST)\lib\cmt.lib       \
     $(DIST)\lib\protocol.lib  \
     $(DIST)\lib\mozreg.lib       \
+    $(DIST)\lib\jsdom.lib \
     $(NULL)
 
 OBJS = \
@@ -60,6 +61,7 @@ OBJS = \
     .\$(OBJDIR)\nsSSLIOLayer.obj \
     .\$(OBJDIR)\nsSSLSocketProvider.obj \
     .\$(OBJDIR)\nsSDR.obj \
+    .\$(OBJDRI)\nsCrypto.obj \
     $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/extensions/psm-glue/src/nsPSMModule.cpp b/extensions/psm-glue/src/nsPSMModule.cpp
index 1826dff9a2b1..ada7389dcfbe 100644
--- a/extensions/psm-glue/src/nsPSMModule.cpp
+++ b/extensions/psm-glue/src/nsPSMModule.cpp
@@ -34,11 +34,17 @@
 #include "nsSSLSocketProvider.h"
 
 #include "nsSDR.h"
+#include "nsCrypto.h"
+
+//For the NS_CRYPTO_PROGID define
+#include "nsDOMCID.h"
 
 #include "nsCURILoader.h"
 
 // Define SDR object constructor
+
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSecretDecoderRing, init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCrypto, init)
 
 static nsModuleComponentInfo components[] =
 {
@@ -111,6 +117,13 @@ static nsModuleComponentInfo components[] =
         NS_SDR_CID,
         NS_SDR_PROGID,
         nsSecretDecoderRingConstructor
+    },
+    
+    {
+        NS_CRYPTO_CLASSNAME,
+        NS_CRYPTO_CID,
+        NS_CRYPTO_PROGID,
+        nsCryptoConstructor
     }
 };