diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 81e631b67755..4b7a66de7abf 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -201,8 +201,6 @@
 @RESPATH@/browser/components/payments.manifest
 @RESPATH@/browser/components/paymentUIService.js
 #endif
-@RESPATH@/components/TooltipTextProvider.js
-@RESPATH@/components/TooltipTextProvider.manifest
 @RESPATH@/components/WebVTT.manifest
 @RESPATH@/components/WebVTTParserWrapper.js
 @RESPATH@/components/nsHelperAppDlg.manifest
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 4cadd01b172b..681b0774e363 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -121,8 +121,6 @@
 @BINPATH@/components/nsDNSServiceDiscovery.js
 #endif
 @BINPATH@/components/toolkitsearch.manifest
-@BINPATH@/components/TooltipTextProvider.js
-@BINPATH@/components/TooltipTextProvider.manifest
 
 @BINPATH@/components/extensions.manifest
 
diff --git a/toolkit/components/tooltiptext/TooltipTextProvider.js b/toolkit/components/tooltiptext/TooltipTextProvider.jsm
similarity index 97%
rename from toolkit/components/tooltiptext/TooltipTextProvider.js
rename to toolkit/components/tooltiptext/TooltipTextProvider.jsm
index 4d3fdccd5bb1..a9c3a9d0f966 100644
--- a/toolkit/components/tooltiptext/TooltipTextProvider.js
+++ b/toolkit/components/tooltiptext/TooltipTextProvider.jsm
@@ -2,7 +2,6 @@
  * 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/. */
 
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 function TooltipTextProvider() {}
@@ -146,5 +145,4 @@ TooltipTextProvider.prototype = {
   QueryInterface: ChromeUtils.generateQI([Ci.nsITooltipTextProvider]),
 };
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TooltipTextProvider]);
-
+var EXPORTED_SYMBOLS = ["TooltipTextProvider"];
diff --git a/toolkit/components/tooltiptext/TooltipTextProvider.manifest b/toolkit/components/tooltiptext/TooltipTextProvider.manifest
deleted file mode 100644
index a7dac6cd9c34..000000000000
--- a/toolkit/components/tooltiptext/TooltipTextProvider.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {f376627f-0bbc-47b8-887e-fc92574cc91f} TooltipTextProvider.js
-contract @mozilla.org/embedcomp/default-tooltiptextprovider;1 {f376627f-0bbc-47b8-887e-fc92574cc91f}
diff --git a/toolkit/components/tooltiptext/components.conf b/toolkit/components/tooltiptext/components.conf
new file mode 100644
index 000000000000..7a097675969a
--- /dev/null
+++ b/toolkit/components/tooltiptext/components.conf
@@ -0,0 +1,14 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+Classes = [
+    {
+        'cid': '{f376627f-0bbc-47b8-887e-fc92574cc91f}',
+        'contract_ids': ['@mozilla.org/embedcomp/default-tooltiptextprovider;1'],
+        'jsm': 'resource://gre/modules/TooltipTextProvider.jsm',
+        'constructor': 'TooltipTextProvider',
+    },
+]
diff --git a/toolkit/components/tooltiptext/moz.build b/toolkit/components/tooltiptext/moz.build
index c75e6b7a465e..28c2aff23aa6 100644
--- a/toolkit/components/tooltiptext/moz.build
+++ b/toolkit/components/tooltiptext/moz.build
@@ -6,9 +6,12 @@
 
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
 
-EXTRA_COMPONENTS += [
-    'TooltipTextProvider.js',
-    'TooltipTextProvider.manifest',
+EXTRA_JS_MODULES += [
+    'TooltipTextProvider.jsm',
+]
+
+XPCOM_MANIFESTS += [
+    'components.conf',
 ]
 
 with Files('**'):