diff --git a/browser/components/payments/paymentUIService.js b/browser/components/payments/PaymentUIService.jsm
similarity index 99%
rename from browser/components/payments/paymentUIService.js
rename to browser/components/payments/PaymentUIService.jsm
index 81f8d7fbd3c2..760f137d210c 100644
--- a/browser/components/payments/paymentUIService.js
+++ b/browser/components/payments/PaymentUIService.jsm
@@ -301,4 +301,4 @@ PaymentUIService.prototype = {
   },
 };
 
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PaymentUIService]);
+var EXPORTED_SYMBOLS = ["PaymentUIService"];
diff --git a/browser/components/payments/components.conf b/browser/components/payments/components.conf
new file mode 100644
index 000000000000..d6a4eb1efcfa
--- /dev/null
+++ b/browser/components/payments/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': '{01f8bd55-9017-438b-85ec-7c15d2b35cdc}',
+        'contract_ids': ['@mozilla.org/dom/payments/payment-ui-service;1'],
+        'jsm': 'resource:///modules/PaymentUIService.jsm',
+        'constructor': 'PaymentUIService',
+    },
+]
diff --git a/browser/components/payments/moz.build b/browser/components/payments/moz.build
index b1bf7fb7527e..1b4604c754db 100644
--- a/browser/components/payments/moz.build
+++ b/browser/components/payments/moz.build
@@ -9,9 +9,12 @@ BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 with Files('**'):
     BUG_COMPONENT = ('Firefox', 'WebPayments UI')
 
-EXTRA_COMPONENTS += [
-    'payments.manifest',
-    'paymentUIService.js',
+EXTRA_JS_MODULES += [
+    'PaymentUIService.jsm',
+]
+
+XPCOM_MANIFESTS += [
+    'components.conf',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
diff --git a/browser/components/payments/payments.manifest b/browser/components/payments/payments.manifest
deleted file mode 100644
index 5d66076a538b..000000000000
--- a/browser/components/payments/payments.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {01f8bd55-9017-438b-85ec-7c15d2b35cdc} paymentUIService.js
-contract @mozilla.org/dom/payments/payment-ui-service;1 {01f8bd55-9017-438b-85ec-7c15d2b35cdc}
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index d934a1cd6494..ea629b0030b7 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -167,10 +167,6 @@
 @RESPATH@/browser/components/EnterprisePoliciesContent.js
 @RESPATH@/browser/components/EnterprisePolicies.manifest
 @RESPATH@/components/toolkitsearch.manifest
-#ifdef NIGHTLY_BUILD
-@RESPATH@/browser/components/payments.manifest
-@RESPATH@/browser/components/paymentUIService.js
-#endif
 @RESPATH@/components/WebVTT.manifest
 @RESPATH@/components/WebVTTParserWrapper.js
 @RESPATH@/components/nsHelperAppDlg.manifest