diff --git a/mozilla/xpinstall/src/CertReader.cpp b/mozilla/xpinstall/src/CertReader.cpp
index 13b9a5a8ce7..83722ba96af 100644
--- a/mozilla/xpinstall/src/CertReader.cpp
+++ b/mozilla/xpinstall/src/CertReader.cpp
@@ -120,7 +120,7 @@ static int my_inflate(unsigned char* compr, PRUint32 comprLen, unsigned char* un
 CertReader::CertReader(nsIURI* aURI, nsISupports* aContext, nsPICertNotification* aObs):
   mContext(aContext),
   mURI(aURI),
-  mObserver(do_QueryInterface(aObs))
+  mObserver(aObs)
 {
 }
 
diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp
index 5df38b3dccd..aae2b73e1a9 100644
--- a/mozilla/xpinstall/src/nsXPInstallManager.cpp
+++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp
@@ -118,14 +118,14 @@ nsXPInstallManager::~nsXPInstallManager()
 }
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS6( nsXPInstallManager,
+NS_IMPL_THREADSAFE_ISUPPORTS7( nsXPInstallManager,
                                nsIXPIListener,
                                nsIXPIDialogService,
                                nsIObserver,
                                nsIStreamListener,
                                nsIProgressEventSink,
-                               nsIInterfaceRequestor);
-
+                               nsIInterfaceRequestor,
+                               nsPICertNotification)
 
 
 NS_IMETHODIMP