diff --git a/toolkit/components/aboutmemory/moz.build b/toolkit/components/aboutmemory/moz.build
index 94ea3bec8de..d82d826087b 100644
--- a/toolkit/components/aboutmemory/moz.build
+++ b/toolkit/components/aboutmemory/moz.build
@@ -7,3 +7,6 @@
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'about:memory')
diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build
index 109db030b3e..f202994ed90 100644
--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@@ -24,3 +24,6 @@ FINAL_LIBRARY = 'xul'
 JAR_MANIFESTS += ['jar.mn']
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Notifications and Alerts')
diff --git a/toolkit/components/asyncshutdown/moz.build b/toolkit/components/asyncshutdown/moz.build
index 662f2a8fe6c..1f1f082202c 100644
--- a/toolkit/components/asyncshutdown/moz.build
+++ b/toolkit/components/asyncshutdown/moz.build
@@ -20,3 +20,6 @@ EXTRA_COMPONENTS += [
     'nsAsyncShutdown.js',
     'nsAsyncShutdown.manifest',
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Async Tooling')
diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build
index a1c05b80b1b..d52e830493b 100644
--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -25,3 +25,6 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Autocomplete')
diff --git a/toolkit/components/commandlines/moz.build b/toolkit/components/commandlines/moz.build
index b943f3480f2..1cf42c5e190 100644
--- a/toolkit/components/commandlines/moz.build
+++ b/toolkit/components/commandlines/moz.build
@@ -27,3 +27,6 @@ SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Startup and Profile System')
diff --git a/toolkit/components/console/moz.build b/toolkit/components/console/moz.build
index d730b9aa3ff..9e01bfb4dcf 100644
--- a/toolkit/components/console/moz.build
+++ b/toolkit/components/console/moz.build
@@ -12,3 +12,6 @@ EXTRA_COMPONENTS += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Error Console')
diff --git a/toolkit/components/contentprefs/moz.build b/toolkit/components/contentprefs/moz.build
index 758b54c5575..ef8376d5f6a 100644
--- a/toolkit/components/contentprefs/moz.build
+++ b/toolkit/components/contentprefs/moz.build
@@ -27,3 +27,5 @@ EXTRA_JS_MODULES += [
     'ContentPrefUtils.jsm',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Preferences')
diff --git a/toolkit/components/crashes/moz.build b/toolkit/components/crashes/moz.build
index 7a4bb9e41b2..7ae567148e7 100644
--- a/toolkit/components/crashes/moz.build
+++ b/toolkit/components/crashes/moz.build
@@ -26,3 +26,6 @@ XPIDL_MODULE = 'toolkit_crashservice'
 XPIDL_SOURCES += [
     'nsICrashService.idl',
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Breakpad Integration')
diff --git a/toolkit/components/ctypes/moz.build b/toolkit/components/ctypes/moz.build
index 56651d27406..5280f1625d4 100644
--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -21,3 +21,6 @@ EXTRA_JS_MODULES += [
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Core', 'js-ctypes')
diff --git a/toolkit/components/formautofill/moz.build b/toolkit/components/formautofill/moz.build
index 74bd9358bf0..e315fc6d613 100644
--- a/toolkit/components/formautofill/moz.build
+++ b/toolkit/components/formautofill/moz.build
@@ -41,3 +41,6 @@ EXTRA_JS_MODULES += [
 JAR_MANIFESTS += [
     'jar.mn',
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Form Manager')
diff --git a/toolkit/components/help/moz.build b/toolkit/components/help/moz.build
index c97072bba2d..913c221e292 100644
--- a/toolkit/components/help/moz.build
+++ b/toolkit/components/help/moz.build
@@ -4,4 +4,7 @@
 # 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/.
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Help Viewer')
diff --git a/toolkit/components/maintenanceservice/moz.build b/toolkit/components/maintenanceservice/moz.build
index 22764c7a32a..a512118d8d2 100644
--- a/toolkit/components/maintenanceservice/moz.build
+++ b/toolkit/components/maintenanceservice/moz.build
@@ -53,3 +53,6 @@ OS_LIBS += [
 ]
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Application Update')
diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build
index f23930f53a9..e8e48355827 100644
--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -19,3 +19,6 @@ UNIFIED_SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Core', 'Video/Audio')
diff --git a/toolkit/components/microformats/moz.build b/toolkit/components/microformats/moz.build
index d574887b403..ce29a105e45 100644
--- a/toolkit/components/microformats/moz.build
+++ b/toolkit/components/microformats/moz.build
@@ -10,3 +10,5 @@ EXTRA_JS_MODULES += [
     'Microformats.js',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Microformats')
diff --git a/toolkit/components/osfile/moz.build b/toolkit/components/osfile/moz.build
index 4abc16c09ef..961bcd4f203 100644
--- a/toolkit/components/osfile/moz.build
+++ b/toolkit/components/osfile/moz.build
@@ -32,3 +32,6 @@ EXTRA_PP_JS_MODULES += [
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'OS.File')
diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build
index 0cf3db0bca2..5c71b36ba74 100644
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -56,3 +56,6 @@ else:
     ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Password Manager')
diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build
index d73e5b40d1c..4c9aa00c713 100644
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -97,3 +97,6 @@ if CONFIG['MOZ_PLACES']:
     FINAL_LIBRARY = 'xul'
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Places')
diff --git a/toolkit/components/printing/moz.build b/toolkit/components/printing/moz.build
index c97072bba2d..6635d17f3b6 100644
--- a/toolkit/components/printing/moz.build
+++ b/toolkit/components/printing/moz.build
@@ -4,4 +4,7 @@
 # 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/.
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Printing')
diff --git a/toolkit/components/promiseworker/moz.build b/toolkit/components/promiseworker/moz.build
index a16839ab166..f48b8a0866e 100644
--- a/toolkit/components/promiseworker/moz.build
+++ b/toolkit/components/promiseworker/moz.build
@@ -13,3 +13,6 @@ EXTRA_JS_MODULES += [
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Async Tooling')
diff --git a/toolkit/components/reader/moz.build b/toolkit/components/reader/moz.build
index 59a8a9c4ca3..6ee08dc6bc2 100644
--- a/toolkit/components/reader/moz.build
+++ b/toolkit/components/reader/moz.build
@@ -17,3 +17,6 @@ EXTRA_JS_MODULES.reader = [
   'ReaderWorker.js',
   'ReaderWorker.jsm'
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Reader Mode')
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build
index a4085ba3641..39359e549fe 100644
--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -33,3 +33,6 @@ DEFINES['MOZ_DISTRIBUTION_ID'] = CONFIG['MOZ_DISTRIBUTION_ID']
 
 if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
     DEFINES['MOZ_FENNEC'] = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'Search')
diff --git a/toolkit/components/social/moz.build b/toolkit/components/social/moz.build
index 13210cc2ebc..abd322cfc4e 100644
--- a/toolkit/components/social/moz.build
+++ b/toolkit/components/social/moz.build
@@ -19,3 +19,6 @@ if CONFIG['MOZ_SOCIAL']:
         'SocialService.jsm',
         'WorkerAPI.jsm',
     ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'SocialAPI')
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build
index 1944a841d8a..2cdb810b965 100644
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -35,3 +35,6 @@ else:
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Startup and Profile System')
diff --git a/toolkit/components/typeaheadfind/moz.build b/toolkit/components/typeaheadfind/moz.build
index 23d99bd0d0f..5c471fab399 100644
--- a/toolkit/components/typeaheadfind/moz.build
+++ b/toolkit/components/typeaheadfind/moz.build
@@ -19,3 +19,6 @@ FINAL_LIBRARY = 'xul'
 JAR_MANIFESTS += ['jar.mn']
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Find Toolbar')
diff --git a/toolkit/components/viewsource/moz.build b/toolkit/components/viewsource/moz.build
index fdbadaf760e..7ed8b22d845 100644
--- a/toolkit/components/viewsource/moz.build
+++ b/toolkit/components/viewsource/moz.build
@@ -8,3 +8,6 @@ BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'View Source')
diff --git a/toolkit/components/workerloader/moz.build b/toolkit/components/workerloader/moz.build
index c0a92d54bf6..b8188961e9b 100644
--- a/toolkit/components/workerloader/moz.build
+++ b/toolkit/components/workerloader/moz.build
@@ -9,3 +9,6 @@ MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 EXTRA_JS_MODULES.workers += [
     'require.js'
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Async Tooling')
diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build
index eff44ca44e8..e6a4a157d0d 100644
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -19,3 +19,12 @@ if 'stlport' in CONFIG['STLPORT_LIBS']:
     DEFINES['USE_STLPORT'] = True
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('aboutTelemetry.*'):
+    BUG_COMPONENT = ('Toolkit', 'Telemetry')
+
+with Files('customizeToolbar.*'):
+    BUG_COMPONENT = ('Toolkit', 'Toolbars and Toolbar Customization')
+
+with Files('widgets/*'):
+    BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build
index 3334ba1d66d..04f44a54e1f 100644
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -106,3 +106,6 @@ LOCAL_INCLUDES += [
 include('/toolkit/crashreporter/crashreporter.mozbuild')
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Breakpad Integration')
diff --git a/toolkit/forgetaboutsite/moz.build b/toolkit/forgetaboutsite/moz.build
index b3ac66647b9..a84235bbd85 100644
--- a/toolkit/forgetaboutsite/moz.build
+++ b/toolkit/forgetaboutsite/moz.build
@@ -11,3 +11,5 @@ EXTRA_JS_MODULES += [
     'ForgetAboutSite.jsm',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Forget About Site')
diff --git a/toolkit/moz.build b/toolkit/moz.build
index 3784ce8f641..b0c87ae0d64 100644
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -52,3 +52,15 @@ elif CONFIG['MOZ_ENABLE_PROFILER_SPS']:
         DIRS += ['crashreporter/google-breakpad/src/common/mac']
     elif CONFIG['OS_ARCH'] == 'Linux':
         DIRS += ['crashreporter/google-breakpad/src/common/linux']
+
+with Files('mozapps/installer/windows/*'):
+    BUG_COMPONENT = ('Toolkit', 'NSIS Installer')
+
+with Files('mozapps/plugins/*'):
+    BUG_COMPONENT = ('Core', 'Plug-ins')
+
+with Files('mozapps/preferences/*'):
+    BUG_COMPONENT = ('Toolkit', 'Preferences')
+
+with Files('mozapps/update/*'):
+    BUG_COMPONENT = ('Toolkit', 'Application Update')
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index 92d8d671f16..234fda4ec7b 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -58,3 +58,6 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Add-ons Manager')
diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build
index ad30af5badd..b5aab835fac 100644
--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -33,3 +33,6 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Startup and Profile System')
diff --git a/toolkit/themes/moz.build b/toolkit/themes/moz.build
index 9fb3d687e7b..8cd5b827d78 100644
--- a/toolkit/themes/moz.build
+++ b/toolkit/themes/moz.build
@@ -23,3 +23,6 @@ else:
         DIRS += ['linux']
     elif CONFIG['MOZ_THEME_FASTSTRIPE']:
         DIRS += ['faststripe/global']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Themes')
diff --git a/xulrunner/moz.build b/xulrunner/moz.build
index 71c24db607c..911acfbe0f2 100644
--- a/xulrunner/moz.build
+++ b/xulrunner/moz.build
@@ -17,3 +17,6 @@ if CONFIG['MAKENSISU']:
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['tools/redit']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'XULRunner')