diff --git a/mozilla/extensions/cookie/nsCookie.cpp b/mozilla/extensions/cookie/nsCookie.cpp
index af25b93fbc4..0bbfc868b4d 100644
--- a/mozilla/extensions/cookie/nsCookie.cpp
+++ b/mozilla/extensions/cookie/nsCookie.cpp
@@ -785,7 +785,7 @@ NET_CookiePermission(char* URLName) {
 /* called from mkgeturl.c, NET_InitNetLib(). This sets the module local cookie pref variables
    and registers the callbacks */
 PUBLIC void
-NET_RegisterCookiePrefCallbacks(void)
+COOKIE_RegisterCookiePrefCallbacks(void)
 {
 	PRInt32	n;
 	PRBool	x;
diff --git a/mozilla/extensions/cookie/nsCookie.h b/mozilla/extensions/cookie/nsCookie.h
index d9dc58d7aef..1d1d50437e8 100644
--- a/mozilla/extensions/cookie/nsCookie.h
+++ b/mozilla/extensions/cookie/nsCookie.h
@@ -59,6 +59,13 @@ extern int NET_SaveCookies(char * filename);
  */
 extern int NET_ReadCookies(char * filename);
 
+
+/* This sets the module local cookie pref variables
+ *  and registers the callbacks 
+ */
+extern void COOKIE_RegisterCookiePrefCallbacks(void);
+
+
 /* wrapper of NET_SetCookieString for netlib use. We need outformat and url_struct to determine
  * whether we're dealing with inline cookies 
  */
diff --git a/mozilla/extensions/cookie/nsCookieService.cpp b/mozilla/extensions/cookie/nsCookieService.cpp
index 751fe43980c..6f4230f1d1d 100644
--- a/mozilla/extensions/cookie/nsCookieService.cpp
+++ b/mozilla/extensions/cookie/nsCookieService.cpp
@@ -160,6 +160,8 @@ nsCookieService::Init()
     rv = pNetModuleMgr->RegisterModule(NS_NETWORK_MODULE_MANAGER_HTTP_RESPONSE_PROGID, eventQ, mCookieHTTPNotify, &kCookieHTTPNotifyCID);
     if (NS_FAILED(rv))
         return rv; 
+
+    COOKIE_RegisterCookiePrefCallbacks();
      
 	return rv;
 }