diff --git a/Makefile.in b/Makefile.in
index 425306f8b4f..7509a96e579 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -155,6 +155,13 @@ tier_9_dirs	+= \
 		db \
 		$(NULL)
 
+ifdef MOZ_PERMISSIONS
+tier_9_dirs += \
+		extensions/cookie \
+		extensions/permissions \
+		$(NULL)
+endif
+
 ifdef MOZ_STORAGE
 tier_9_dirs += storage
 endif
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 749c126eb7c..bccc5a3f5dd 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -204,6 +204,7 @@ MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
 
 MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
 MOZ_MATHML = @MOZ_MATHML@
+MOZ_PERMISSIONS = @MOZ_PERMISSIONS@
 MOZ_XTF = @MOZ_XTF@
 MOZ_XMLEXTRAS = @MOZ_XMLEXTRAS@
 MOZ_NO_INSPECTOR_APIS = @MOZ_NO_INSPECTOR_APIS@
diff --git a/configure.in b/configure.in
index 0960d12e5a2..1ffc91b5e16 100644
--- a/configure.in
+++ b/configure.in
@@ -4000,7 +4000,7 @@ MOZ_BRANDING_DIRECTORY=
 MOZ_CALENDAR=
 MOZ_DBGRINFO_MODULES=
 MOZ_ENABLE_CANVAS=1
-MOZ_EXTENSIONS_ALL=" cookie wallet xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs sroaming xmlterm datetime finger cview layout-debug tasks sql xforms permissions schema-validation reporter safe-browsing"
+MOZ_EXTENSIONS_ALL=" wallet xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs sroaming xmlterm datetime finger cview layout-debug tasks sql xforms schema-validation reporter safe-browsing"
 MOZ_FEEDS=1
 MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp xbm icon"
 MOZ_IMG_ENCODERS_DEFAULT="png jpeg"
@@ -4021,6 +4021,7 @@ MOZ_NO_INSPECTOR_APIS=
 MOZ_NO_XPCOM_OBSOLETE=
 MOZ_NO_FAST_LOAD=
 MOZ_OJI=1
+MOZ_PERMISSIONS=1
 MOZ_PLACES=
 MOZ_PLAINTEXT_EDITOR_ONLY=
 MOZ_PLUGINS=1
@@ -4141,7 +4142,7 @@ basic)
   MOZ_COMPOSER=
   MOZ_ENABLE_CANVAS=
   MOZ_ENABLE_POSTSCRIPT=
-  MOZ_EXTENSIONS_DEFAULT=" cookie spatialnavigation permissions"
+  MOZ_EXTENSIONS_DEFAULT=" spatialnavigation"
   MOZ_IMG_DECODERS_DEFAULT="png gif jpeg"
   MOZ_IMG_ENCODERS_DEFAULT=
   MOZ_IMG_ENCODERS=
@@ -4190,7 +4191,7 @@ minimal)
   MOZ_COMPOSER=
   MOZ_ENABLE_CANVAS=
   MOZ_ENABLE_POSTSCRIPT=
-  MOZ_EXTENSIONS_DEFAULT=" cookie spatialnavigation permissions"
+  MOZ_EXTENSIONS_DEFAULT=" spatialnavigation"
   MOZ_IMG_DECODERS_DEFAULT="png gif jpeg"
   MOZ_IMG_ENCODERS_DEFAULT=
   MOZ_IMG_ENCODERS=
@@ -4250,7 +4251,7 @@ suite)
   MOZ_SUITE=1
   MOZ_PROFILESHARING=
   MOZ_APP_VERSION=$SEAMONKEY_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" cookie wallet xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs sroaming permissions reporter"
+  MOZ_EXTENSIONS_DEFAULT=" wallet xml-rpc help p3p venkman inspector irc typeaheadfind spellcheck gnomevfs sroaming reporter"
   AC_DEFINE(MOZ_SUITE)
   ;;
 
@@ -4264,7 +4265,7 @@ browser)
   MOZ_SAFE_BROWSING=1
   MOZ_APP_VERSION=$FIREFOX_VERSION
   MOZ_NO_XPCOM_OBSOLETE=1
-  MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc inspector gnomevfs permissions reporter spellcheck"
+  MOZ_EXTENSIONS_DEFAULT=" xml-rpc inspector gnomevfs reporter spellcheck"
   AC_DEFINE(MOZ_PHOENIX)
   ;;
 
@@ -4354,7 +4355,7 @@ macbrowser)
   MOZ_SINGLE_PROFILE=1
   MOZ_APP_DISPLAYNAME=Mozilla
   MOZ_APP_VERSION=$MOZILLA_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" cookie typeaheadfind permissions"
+  MOZ_EXTENSIONS_DEFAULT=" typeaheadfind"
 # MOZ_XUL_APP=1
   MOZ_AUTH_EXTENSION=
   MOZ_PREF_EXTENSIONS=
@@ -5300,6 +5301,15 @@ if test -n "$MOZ_NO_FAST_LOAD"; then
     AC_DEFINE(MOZ_NO_FAST_LOAD)
 fi
 
+dnl ========================================================
+dnl Permissions System
+dnl ========================================================
+MOZ_ARG_DISABLE_BOOL(permissions,
+[  --disable-permissions   Disable permissions (popup and cookie blocking)],
+    MOZ_PERMISSIONS=,
+    MOZ_PERMISSIONS=1
+)
+
 dnl ========================================================
 dnl NegotiateAuth
 dnl ========================================================
@@ -5465,11 +5475,7 @@ fi
 dnl cookie must be built before tridentprofile. put it at list's end.
 if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0; then
   MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|tridentprofile||'`
-  if test `echo "$MOZ_EXTENSIONS" | grep -c cookie` -eq 0; then
-    AC_MSG_WARN([tridentprofile extension requires cookie. Removing tridentprofile.])
-  else
-    MOZ_EXTENSIONS="$MOZ_EXTENSIONS tridentprofile"
-  fi
+  MOZ_EXTENSIONS="$MOZ_EXTENSIONS tridentprofile"
 fi
 
 dnl xforms requires xtf and webservices and schema-validation
@@ -5497,6 +5503,11 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c xmlextras` -ne 0; then
     MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xmlextras||g'`
 fi
 
+if test `echo "$MOZ_EXTENSIONS" | grep -c 'cookie\|permissions'` -ne 0; then
+    AC_MSG_WARN([cookie and permissions are no longer extensions, use --disable-permissions to disable.])
+    MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|cookie||g; s|permissions||g'`
+fi
+
 if test `echo "$MOZ_EXTENSIONS" | grep -c webservices` -ne 0; then
     AC_MSG_WARN([webservices is no longer an extension, use --disable-webservices to disable.])
     MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|webservices||g'`
@@ -7349,6 +7360,7 @@ AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MINIMO)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 AC_SUBST(MOZ_MATHML)
+AC_SUBST(MOZ_PERMISSIONS)
 AC_SUBST(MOZ_XTF)
 AC_SUBST(MOZ_XMLEXTRAS)
 AC_SUBST(MOZ_NO_INSPECTOR_APIS)
diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in
index 1010f50848d..023ffea34d6 100644
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -48,7 +48,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCookieModule
 GRE_MODULE	= 1
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY = 1
 
 PACKAGE_FILE = cookie.pkg
 
diff --git a/extensions/permissions/Makefile.in b/extensions/permissions/Makefile.in
index df1b8513907..7d0550668dd 100644
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -47,7 +47,7 @@ SHORT_LIBNAME	= perms
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPermissionsModule
-MOZILLA_INTERNAL_API = 1
+LIBXUL_LIBRARY = 1
 
 #PACKAGE_FILE	= permissions.pkg
 
diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index 1a92aea80d1..ef9ab9c6b63 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -129,6 +129,11 @@ COMPONENT_LIBS += auth
 DEFINES += -DMOZ_AUTH_EXTENSION
 endif
 
+ifdef MOZ_PERMISSIONS
+COMPONENT_LIBS += cookie permissions
+DEFINES += -DMOZ_PERMISSIONS
+endif
+
 ifdef MOZ_UNIVERSALCHARDET
 COMPONENT_LIBS += universalchardet
 DEFINES += -DMOZ_UNIVERSALCHARDET
diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
index 33f08deb6e3..cecec087ce0 100644
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -53,6 +53,14 @@
 #define AUTH_MODULE
 #endif
 
+#ifdef MOZ_PERMISSIONS
+#define PERMISSIONS_MODULES                  \
+    MODULE(nsCookieModule)                   \
+    MODULE(nsPermissionsModule)
+#else
+#define PERMISSIONS_MODULES
+#endif
+
 #ifdef MOZ_UNIVERSALCHARDET
 #define UNIVERSALCHARDET_MODULE MODULE(nsUniversalCharDetModule)
 #else
@@ -203,6 +211,7 @@
     INTL_COMPAT_MODULES                      \
     UNIVERSALCHARDET_MODULE                  \
     MODULE(necko)                            \
+    PERMISSIONS_MODULES                      \
     AUTH_MODULE                              \
     IPC_MODULE                               \
     MODULE(nsJarModule)                      \