diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
index 249eb1895ef..922288c4627 100644
--- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp
+++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
@@ -251,7 +251,7 @@ nsAppShellService::EnumerateComponents( void (nsAppShellService::*function)( con
          &&
          ( failed = "Open" )
          &&
-         NS_SUCCEEDED( ( rv = registry->Open() ) )
+         NS_SUCCEEDED( ( rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry) ) )
          &&
          ( failed = "GetSubtree" )
          &&
diff --git a/mozilla/xpfe/components/public/nsIAppShellComponentImpl.h b/mozilla/xpfe/components/public/nsIAppShellComponentImpl.h
index 42c0ad35e18..2ba42ea884b 100644
--- a/mozilla/xpfe/components/public/nsIAppShellComponentImpl.h
+++ b/mozilla/xpfe/components/public/nsIAppShellComponentImpl.h
@@ -287,7 +287,7 @@ NSRegisterSelf( nsISupports* aServiceMgr, const char* path ) { \
                                                          nsIRegistry::GetIID(), \
                                                          (nsISupports**)&registry ); \
                 if ( NS_SUCCEEDED( rv ) ) { \
-                    registry->Open(); \
+                    registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); \
                     char buffer[256]; \
                     char *cid = className::GetCID().ToString(); \
                     PR_snprintf( buffer, \
diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
index 48bec18cc18..e16097cd22b 100644
--- a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
+++ b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp
@@ -549,7 +549,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char *path)
 
     if ( NS_SUCCEEDED( rv ) ) 
     {
-        registry->Open();
+        registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
         char buffer[256];
         char *cid = nsSoftwareUpdate::GetCID().ToString();
         PR_snprintf( buffer,