diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
index 6ff2c5028dd..7192280da61 100644
--- a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
@@ -843,7 +843,9 @@ getPSMCertType(const char * aContentType)
 }
 
 
-NS_IMPL_ISUPPORTS(CertContentListener, NS_GET_IID(nsIURIContentListener)); 
+NS_IMPL_ISUPPORTS2(CertContentListener,
+                   nsIURIContentListener,
+                   nsISupportsWeakReference); 
 
 CertContentListener::CertContentListener()
 {
diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.h b/mozilla/security/manager/ssl/src/nsNSSComponent.h
index 695f7a77694..fdd0a6e459e 100644
--- a/mozilla/security/manager/ssl/src/nsNSSComponent.h
+++ b/mozilla/security/manager/ssl/src/nsNSSComponent.h
@@ -122,7 +122,8 @@ private:
 // Now we need a content listener to register 
 //--------------------------------------------
 
-class CertContentListener : public nsIURIContentListener {
+class CertContentListener : public nsIURIContentListener,
+                            public nsSupportsWeakReference {
 public:
   CertContentListener();
   virtual ~CertContentListener();