--- a/devtools/install.rdf
+++ b/devtools/install.rdf
@@ -12,17 +12,26 @@
                em:name="Developer Tools (local version)"
                em:description="Add-on to load DevTools from local sources and easily reload them with Ctrl+Alt+r shortcut"
                em:version="44.0a1"
                em:type="2"
                em:creator="Mozilla">
 
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
+    <!-- Firefox -->
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>44.0a1</em:minVersion>
         <em:maxVersion>*</em:maxVersion>
       </Description>
     </em:targetApplication>
+    <!-- Fennec -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
+        <em:minVersion>44.0a1</em:minVersion>
+        <em:maxVersion>*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
   </Description>
 </RDF>

--- a/devtools/moz.build
+++ b/devtools/moz.build
@@ -22,20 +22,30 @@ DIRS += [
 ]
 
 if CONFIG['MOZ_DEVTOOLS'] != 'addon':
     DIRS += [
         'server',
         'shared',
     ]
     FINAL_TARGET_FILES.features['devtools@mozilla.org'] += [
-        'bootstrap.js',
         'install.rdf',
     ]
 
+# For Fennec, provide an empty bootstrap.js that doesn't do anything.
+# DevTools initialization is handled by mobile/android/chrome/content/RemoteDebugger.js
+if CONFIG['MOZ_DEVTOOLS'] == 'server':
+    FINAL_TARGET_FILES.features['devtools@mozilla.org'] += [
+      'server/bootstrap.js',
+    ]
+elif CONFIG['MOZ_DEVTOOLS'] != 'addon':
+    FINAL_TARGET_FILES.features['devtools@mozilla.org'] += [
+      'bootstrap.js',
+    ]
+
 # /browser uses DIST_SUBDIR.  We opt-in to this treatment when building
 # DevTools for the browser to keep the root omni.ja slim for use by external XUL
 # apps.  Mulet also uses this since it includes /browser.
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DIST_SUBDIR = 'browser'
     export('DIST_SUBDIR')
 
 with Files('**'):

new file mode 100644
--- /dev/null
+++ b/devtools/server/bootstrap.js
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* exported startup, shutdown, install, uninstall */
+
+// Fake bootstrap used when shipping only server part of devtools.
+
+"use strict";
+
+function startup(data) {
+}
+
+function shutdown(data, reason) {
+}
+
+function install() {}
+function uninstall() {}