new file mode 100644
--- /dev/null
+++ b/mozilla-M-C-016-specialpowers.patch
@@ -0,0 +1,71 @@
+# HG changeset patch
+# User ISHIKAWA, Chiaki <ishikawa@yk.rim.or.jp>
+# Parent  8c4a58a623f397385acfbbce2e72253c1fc27553
+special-powers@mozilla.org -> specialpowers@mozilla.org
+
+diff --git a/build/mobile/b2gautomation.py b/build/mobile/b2gautomation.py
+--- a/build/mobile/b2gautomation.py
++++ b/build/mobile/b2gautomation.py
+@@ -89,18 +89,18 @@ class B2GRemoteAutomation(Automation):
+         for rdfChild in document.documentElement.childNodes:
+             if rdfChild.nodeType == Node.ELEMENT_NODE and rdfChild.tagName == "Description":
+                 for descChild in rdfChild.childNodes:
+                     if descChild.nodeType == Node.ELEMENT_NODE and descChild.tagName == "em:id":
+                         return descChild.childNodes[0].data
+         return None
+ 
+     def installExtension(self, extensionSource, profileDir, extensionID=None):
+-        # Bug 827504 - installing special-powers extension separately causes problems in B2G
+-        if extensionID != "special-powers@mozilla.org":
++        # Bug 827504 - installing specialpowers extension separately causes problems in B2G
++        if extensionID != "specialpowers@mozilla.org":
+             if not os.path.isdir(profileDir):
+               self.log.info("INFO | automation.py | Cannot install extension, invalid profileDir at: %s", profileDir)
+               return
+ 
+             installRDFFilename = "install.rdf"
+ 
+             extensionsRootDir = os.path.join(profileDir, "extensions", "staged")
+             if not os.path.isdir(extensionsRootDir):
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
+@@ -5339,17 +5339,17 @@ pref("dom.mozSettings.SettingsService.ve
+ pref("dom.mozSettings.allowForceReadOnly", false);
+ 
+ // The interval at which to check for slow running addons
+ #ifdef NIGHTLY_BUILD
+ pref("browser.addon-watch.interval", 15000);
+ #else
+ pref("browser.addon-watch.interval", -1);
+ #endif
+-pref("browser.addon-watch.ignore", "[\"mochikit@mozilla.org\",\"special-powers@mozilla.org\",\"fxdevtools-adapters@mozilla.org\",\"fx-devtools\"]");
++pref("browser.addon-watch.ignore", "[\"mochikit@mozilla.org\",\"specialpowers@mozilla.org\",\"fxdevtools-adapters@mozilla.org\",\"fx-devtools\"]");
+ 
+ // Search service settings
+ pref("browser.search.log", false);
+ pref("browser.search.update", true);
+ pref("browser.search.update.log", false);
+ pref("browser.search.update.interval", 21600);
+ pref("browser.search.suggest.enabled", true);
+ pref("browser.search.reset.enabled", false);
+diff --git a/testing/specialpowers/install.rdf b/testing/specialpowers/install.rdf
+--- a/testing/specialpowers/install.rdf
++++ b/testing/specialpowers/install.rdf
+@@ -1,15 +1,15 @@
+ <?xml version="1.0"?>
+ 
+ <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+ 
+   <Description about="urn:mozilla:install-manifest">
+-    <em:id>special-powers@mozilla.org</em:id>
++    <em:id>specialpowers@mozilla.org</em:id>
+     <em:version>2015.11.16</em:version>
+     <em:type>2</em:type>
+     <em:bootstrap>true</em:bootstrap>
+ 
+     <!-- Target Application this extension can install into, 
+          with minimum and maximum supported versions. -->
+     <em:targetApplication>
+       <Description>