diff --git a/toolkit/webapps/moz.build b/toolkit/webapps/moz.build
index 69fb0356bba..d6a7433e508 100644
--- a/toolkit/webapps/moz.build
+++ b/toolkit/webapps/moz.build
@@ -4,6 +4,9 @@
 # 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/.
 
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'Web Apps')
+
 EXTRA_PP_JS_MODULES += [
     'NativeApp.jsm',
     'WebappOSUtils.jsm',
diff --git a/webapprt/moz.build b/webapprt/moz.build
index 5713f25d713..2b2dc7d9ff9 100644
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -4,6 +4,9 @@
 # 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/.
 
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'Webapp Runtime')
+
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['win']
 elif CONFIG['OS_ARCH'] == 'Darwin':