--- a/toolkit/components/aboutmemory/moz.build
+++ b/toolkit/components/aboutmemory/moz.build
@@ -2,8 +2,11 @@
 # 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/.
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'about:memory')

--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@@ -19,8 +19,11 @@ UNIFIED_SOURCES += [
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 JAR_MANIFESTS += ['jar.mn']
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Notifications and Alerts')

--- a/toolkit/components/asyncshutdown/moz.build
+++ b/toolkit/components/asyncshutdown/moz.build
@@ -15,8 +15,11 @@ XPIDL_SOURCES += [
 EXTRA_JS_MODULES += [
     'AsyncShutdown.jsm',
 ]
 
 EXTRA_COMPONENTS += [
     'nsAsyncShutdown.js',
     'nsAsyncShutdown.manifest',
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Async Tooling')

--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -20,8 +20,11 @@ XPIDL_MODULE = 'autocomplete'
 UNIFIED_SOURCES += [
     'nsAutoCompleteController.cpp',
     'nsAutoCompleteSimpleResult.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Autocomplete')

--- a/toolkit/components/commandlines/moz.build
+++ b/toolkit/components/commandlines/moz.build
@@ -22,8 +22,11 @@ XPIDL_MODULE = 'commandlines'
 
 SOURCES += [
     'nsCommandLine.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Startup and Profile System')

--- a/toolkit/components/console/moz.build
+++ b/toolkit/components/console/moz.build
@@ -7,8 +7,11 @@
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
 EXTRA_COMPONENTS += [
     'jsconsole-clhandler.js',
     'jsconsole-clhandler.manifest',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Error Console')

--- a/toolkit/components/contentprefs/moz.build
+++ b/toolkit/components/contentprefs/moz.build
@@ -22,8 +22,10 @@ EXTRA_JS_MODULES += [
     'ContentPrefInstance.jsm',
     'ContentPrefService2.jsm',
     'ContentPrefServiceChild.jsm',
     'ContentPrefServiceParent.jsm',
     'ContentPrefStore.jsm',
     'ContentPrefUtils.jsm',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Preferences')

--- a/toolkit/components/crashes/moz.build
+++ b/toolkit/components/crashes/moz.build
@@ -21,8 +21,11 @@ TESTING_JS_MODULES += [
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
 
 XPIDL_MODULE = 'toolkit_crashservice'
 
 XPIDL_SOURCES += [
     'nsICrashService.idl',
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Breakpad Integration')

--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -16,8 +16,11 @@ LOCAL_INCLUDES += [
 
 EXTRA_JS_MODULES += [
     'ctypes.jsm',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Core', 'js-ctypes')

--- a/toolkit/components/formautofill/moz.build
+++ b/toolkit/components/formautofill/moz.build
@@ -36,8 +36,11 @@ EXTRA_JS_MODULES += [
     'content/RequestAutocompleteUI.jsm',
     'FormAutofill.jsm',
     'FormAutofillIntegration.jsm',
 ]
 
 JAR_MANIFESTS += [
     'jar.mn',
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Form Manager')

--- a/toolkit/components/help/moz.build
+++ b/toolkit/components/help/moz.build
@@ -1,7 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; 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/.
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Help Viewer')

--- a/toolkit/components/maintenanceservice/moz.build
+++ b/toolkit/components/maintenanceservice/moz.build
@@ -48,8 +48,11 @@ DISABLE_STL_WRAPPING = True
 
 OS_LIBS += [
     'comctl32',
     'ws2_32',
     'shell32',
 ]
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Application Update')

--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -14,8 +14,11 @@ UNIFIED_SOURCES += [
     'mp3sniff.c',
     'nsMediaSniffer.cpp',
     'nsMediaSnifferModule.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Core', 'Video/Audio')

--- a/toolkit/components/microformats/moz.build
+++ b/toolkit/components/microformats/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 EXTRA_JS_MODULES += [
     'Microformats.js',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Microformats')

--- a/toolkit/components/osfile/moz.build
+++ b/toolkit/components/osfile/moz.build
@@ -27,8 +27,11 @@ EXPORTS.mozilla += [
 
 EXTRA_PP_JS_MODULES += [
     'osfile.jsm',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'OS.File')

--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -51,8 +51,11 @@ else:
         'storage-json.js',
     ]
     EXTRA_JS_MODULES += [
         'LoginImport.jsm',
         'LoginStore.jsm',
     ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Password Manager')

--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -92,8 +92,11 @@ if CONFIG['MOZ_PLACES']:
             'UnifiedComplete.manifest',
         ]
 
     FAIL_ON_WARNINGS = True
 
     FINAL_LIBRARY = 'xul'
 
 include('/ipc/chromium/chromium-config.mozbuild')
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Places')

--- a/toolkit/components/printing/moz.build
+++ b/toolkit/components/printing/moz.build
@@ -1,7 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; 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/.
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Printing')

--- a/toolkit/components/promiseworker/moz.build
+++ b/toolkit/components/promiseworker/moz.build
@@ -8,8 +8,11 @@ DIRS += [
     'worker'
 ]
 
 EXTRA_JS_MODULES += [
     'PromiseWorker.jsm',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Async Tooling')

--- a/toolkit/components/reader/moz.build
+++ b/toolkit/components/reader/moz.build
@@ -12,8 +12,11 @@ EXTRA_JS_MODULES += [
 ]
 
 EXTRA_JS_MODULES.reader = [
   'JSDOMParser.js',
   'Readability.js',
   'ReaderWorker.js',
   'ReaderWorker.jsm'
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Reader Mode')

--- a/toolkit/components/search/moz.build
+++ b/toolkit/components/search/moz.build
@@ -28,8 +28,11 @@ EXTRA_PP_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'SearchStaticData.jsm',
 ]
 
 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')

--- a/toolkit/components/social/moz.build
+++ b/toolkit/components/social/moz.build
@@ -14,8 +14,11 @@ if CONFIG['MOZ_SOCIAL']:
         'FrameWorker.jsm',
         'FrameWorkerContent.js',
         'MessagePortBase.jsm',
         'MessagePortWorker.js',
         'MozSocialAPI.jsm',
         'SocialService.jsm',
         'WorkerAPI.jsm',
     ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'SocialAPI')

--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -30,8 +30,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
 else:
     UNIFIED_SOURCES += [
         'nsUserInfoUnix.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Startup and Profile System')

--- a/toolkit/components/typeaheadfind/moz.build
+++ b/toolkit/components/typeaheadfind/moz.build
@@ -14,8 +14,11 @@ SOURCES += [
     'nsTypeAheadFind.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 JAR_MANIFESTS += ['jar.mn']
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Find Toolbar')

--- a/toolkit/components/viewsource/moz.build
+++ b/toolkit/components/viewsource/moz.build
@@ -3,8 +3,11 @@
 # 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/.
 
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'View Source')

--- a/toolkit/components/workerloader/moz.build
+++ b/toolkit/components/workerloader/moz.build
@@ -4,8 +4,11 @@
 # 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/.
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
 EXTRA_JS_MODULES.workers += [
     'require.js'
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Async Tooling')

--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -14,8 +14,17 @@ DEFINES['CFLAGS'] = CONFIG['OS_CFLAGS']
 
 if CONFIG['OS_TARGET'] == 'Android':
     DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
 
 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')

--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -101,8 +101,11 @@ JAR_MANIFESTS += ['jar.mn']
 
 LOCAL_INCLUDES += [
     'google-breakpad/src',
 ]
 
 include('/toolkit/crashreporter/crashreporter.mozbuild')
 
 FAIL_ON_WARNINGS = True
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Breakpad Integration')

--- a/toolkit/forgetaboutsite/moz.build
+++ b/toolkit/forgetaboutsite/moz.build
@@ -6,8 +6,10 @@
 
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 EXTRA_JS_MODULES += [
     'ForgetAboutSite.jsm',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Forget About Site')

--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -47,8 +47,20 @@ elif CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     DIRS += [
     'crashreporter/google-breakpad/src/common',
     'crashreporter/google-breakpad/src/processor',
     ]
     if CONFIG['OS_ARCH'] == 'Darwin':
         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')

--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -53,8 +53,11 @@ EXPORTS.mozilla += [
 
 UNIFIED_SOURCES += [
     'AddonPathService.cpp'
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Add-ons Manager')

--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -28,8 +28,11 @@ LOCAL_INCLUDES += [
     '/profile/dirserviceprovider',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Startup and Profile System')

--- a/toolkit/themes/moz.build
+++ b/toolkit/themes/moz.build
@@ -18,8 +18,11 @@ if toolkit == 'cocoa':
     DIRS += ['osx']
 else:
     DIRS += ['windows']
 
     if toolkit in ('gtk2', 'gtk3', 'qt'):
         DIRS += ['linux']
     elif CONFIG['MOZ_THEME_FASTSTRIPE']:
         DIRS += ['faststripe/global']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Themes')

--- a/xulrunner/moz.build
+++ b/xulrunner/moz.build
@@ -12,8 +12,11 @@ DIRS += [
     'examples',
 ]
 
 if CONFIG['MAKENSISU']:
     DIRS += ['installer/windows']
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['tools/redit']
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'XULRunner')