diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
index ceafdb5ae4f5..3c52c50480ac 100644
--- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
@@ -412,13 +412,26 @@ nsresult
 mozJSComponentLoader::SetRegistryInfo(const char *registryLocation,
                                       nsIFile *component)
 {
+    nsresult rv;
     if (!mRegistry.get())
         return NS_OK;           // silent failure
 
-    nsresult rv;
+    PRUint32 length = strlen(registryLocation);
+    char* eRegistryLocation;
+    rv = mRegistry->EscapeKey((PRUint8*)registryLocation, 1, &length, (PRUint8**)&eRegistryLocation);
+    if (rv != NS_OK)
+    {
+        return rv;
+    }
+    if (eRegistryLocation == nsnull)    //  No escaping required
+    eRegistryLocation = (char*)registryLocation;
+
+
     nsRegistryKey key;
 
-    rv = mRegistry->AddSubtreeRaw(mXPCOMKey, registryLocation, &key);
+    rv = mRegistry->AddSubtreeRaw(mXPCOMKey, eRegistryLocation, &key);
+    if (registryLocation != eRegistryLocation)
+	nsAllocator::Free(eRegistryLocation);
     if (NS_FAILED(rv))
         return rv;
 
@@ -431,6 +444,8 @@ mozJSComponentLoader::SetRegistryInfo(const char *registryLocation,
     PRInt64 fileSize;
     if (NS_FAILED(rv = component->GetFileSize(&fileSize)) ||
         NS_FAILED(rv = mRegistry->SetLongLong(key, fileSizeValueName, &fileSize)))
+	if (registryLocation != eRegistryLocation)
+	    nsAllocator::Free(eRegistryLocation);
         return rv;
 
 #ifdef DEBUG_shaver_off
@@ -447,20 +462,53 @@ mozJSComponentLoader::RemoveRegistryInfo(const char *registryLocation)
     if (!mRegistry.get())
         return NS_OK;           // silent failure
 
-    return mRegistry->RemoveSubtree(mXPCOMKey, registryLocation);
+    nsresult rv;
+    if (!mRegistry.get())
+        return NS_OK;           // silent failure
+
+    PRUint32 length = strlen(registryLocation);
+    char* eRegistryLocation;
+    rv = mRegistry->EscapeKey((PRUint8*)registryLocation, 1, &length, (PRUint8**)&eRegistryLocation);
+    if (rv != NS_OK)
+    {
+        return rv;
+    }
+    if (eRegistryLocation == nsnull)    //  No escaping required
+    eRegistryLocation = (char*)registryLocation;
+
+
+    rv = mRegistry->RemoveSubtree(mXPCOMKey, eRegistryLocation);
+	
+    if (registryLocation != eRegistryLocation)
+	    nsAllocator::Free(eRegistryLocation);
+
+    return rv;
 }
 
 PRBool
 mozJSComponentLoader::HasChanged(const char *registryLocation,
                                  nsIFile *component)
 {
-
     /* if we don't have a registry handle, force registration of component */
     if (!mRegistry)
         return PR_TRUE;
 
+    nsresult rv;
+    PRUint32 length = strlen(registryLocation);
+    char* eRegistryLocation;
+    rv = mRegistry->EscapeKey((PRUint8*)registryLocation, 1, &length, (PRUint8**)&eRegistryLocation);
+    if (rv != NS_OK)
+    {
+        return rv;
+    }
+    if (eRegistryLocation == nsnull)    //  No escaping required
+        eRegistryLocation = (char*)registryLocation;
+
     nsRegistryKey key;
-    if (NS_FAILED(mRegistry->GetSubtreeRaw(mXPCOMKey, registryLocation, &key)))
+    int r = NS_FAILED(mRegistry->GetSubtreeRaw(mXPCOMKey, eRegistryLocation, &key));
+    if (registryLocation != eRegistryLocation)
+	nsAllocator::Free(eRegistryLocation);
+    if (r)
         return PR_TRUE;
 
     /* check modification date */