--- a/calendar/base/backend/icaljs/moz.build
+++ b/calendar/base/backend/icaljs/moz.build
@@ -1,8 +1,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/.
 
 EXTRA_COMPONENTS += [
     'calICALJSComponents.js',
 ]
+
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'ICAL.js Integration')

--- a/calendar/base/backend/moz.build
+++ b/calendar/base/backend/moz.build
@@ -8,8 +8,10 @@ DIRS = [
     'icaljs'
 ]
 
 EXTRA_COMPONENTS += [
     'calBackendLoader.js',
     'calBackendLoader.manifest',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Internal Components')

--- a/calendar/base/moz.build
+++ b/calendar/base/moz.build
@@ -13,8 +13,29 @@ DIRS = [
 JAR_MANIFESTS += ['jar.mn']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DEFINES['THEME'] = 'windows'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DEFINES['THEME'] = 'osx'
 else:
     DEFINES['THEME'] = 'linux'
+
+with Files('content/**'):
+    BUG_COMPONENT = ('Calendar', 'Calendar Views')
+
+with Files('content/preferences/**'):
+    BUG_COMPONENT = ('Calendar', 'Preferences')
+
+with Files('content/dialogs/**'):
+    BUG_COMPONENT = ('Calendar', 'Dialogs')
+
+with Files('content/*task*'):
+    BUG_COMPONENT = ('Calendar', 'Tasks')
+
+with Files('content/dialogs/*alarm*'):
+    BUG_COMPONENT = ('Calendar', 'Alarms')
+
+with Files('content/widgets/*alarm*'):
+    BUG_COMPONENT = ('Calendar', 'Alarms')
+
+with Files('themes/**'):
+    BUG_COMPONENT = ('Calendar', 'Calendar Views')

--- a/calendar/base/public/moz.build
+++ b/calendar/base/public/moz.build
@@ -49,8 +49,13 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'calbase'
 
 EXPORTS += [
     'calBaseCID.h',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Internal Components')
+
+with Files('calIAlarm*'):
+    BUG_COMPONENT = ('Calendar', 'Alarms')

--- a/calendar/base/src/moz.build
+++ b/calendar/base/src/moz.build
@@ -15,8 +15,14 @@ EXTRA_COMPONENTS += [
     'calItemModule.js',
     'calItemModule.manifest',
     'calSleepMonitor.js',
     'calSleepMonitor.manifest',
     'calTimezoneService.js',
     'calTimezoneService.manifest',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Internal Components')
+
+with Files('calAlarm*'):
+    BUG_COMPONENT = ('Calendar', 'Alarms')
+

--- a/calendar/import-export/moz.build
+++ b/calendar/import-export/moz.build
@@ -4,8 +4,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_COMPONENTS += [
     'calImportExportModule.js',
     'calImportExportModule.manifest',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Import and Export')
+
+with Files('*Print*'):
+    BUG_COMPONENT = ('Calendar', 'Printing')

--- a/calendar/itip/moz.build
+++ b/calendar/itip/moz.build
@@ -3,8 +3,10 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'calItipEmailTransport.js',
     'calItipEmailTransport.manifest',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'E-mail based Scheduling (iTIP/iMIP)')

--- a/calendar/libical/moz.build
+++ b/calendar/libical/moz.build
@@ -1,6 +1,9 @@
 # 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/.
 
 DIRS += ['src']
+
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Internal Components')

--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -26,8 +26,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
     DEFINES['THEME'] = 'osx'
 else:
     DEFINES['THEME'] = 'linux'
 
 JS_PREFERENCE_FILES += [
     'content/lightning.js',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Lightning Only')
+
+with Files('content/suite-*'):
+    BUG_COMPONENT = ('Calendar', 'Lightning: SeaMonkey Integration')
+
+with Files('build/**'):
+    BUG_COMPONENT = ('Calendar', 'Build Config')
+
+with Files('application.ini'):
+    BUG_COMPONENT = ('Calendar', 'Build Config')

--- a/calendar/moz.build
+++ b/calendar/moz.build
@@ -8,8 +8,26 @@ CONFIGURE_SUBST_FILES += ['installer/Mak
 if CONFIG['MOZ_CALENDAR']:
     DIRS += [
         'lightning',
         'timezones'
     ]
 
 TEST_DIRS += ['test']
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'General')
+
+with Files('**/moz.build'):
+    BUG_COMPONENT = ('Calendar', 'Build Config')
+    FINAL = True
+
+with Files('**/*.mk'):
+    BUG_COMPONENT = ('Calendar', 'Build Config')
+    FINAL = True
+
+with Files('**/*manifest'):
+    BUG_COMPONENT = ('Calendar', 'Build Config')
+    FINAL = True
+
+with Files('**/Makefile.in'):
+    BUG_COMPONENT = ('Calendar', 'Build Config')
+    FINAL = True

--- a/calendar/providers/caldav/moz.build
+++ b/calendar/providers/caldav/moz.build
@@ -5,8 +5,10 @@
 
 DIRS += ['public']
 
 EXTRA_COMPONENTS += [
     'calDavCalendar.js',
     'calDavCalendar.manifest',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Provider: CalDAV')

--- a/calendar/providers/gdata/moz.build
+++ b/calendar/providers/gdata/moz.build
@@ -36,8 +36,10 @@ EXTRA_COMPONENTS += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
 
 JS_PREFERENCE_FILES += [
     'defaults/preferences.js',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Provider: GData')

--- a/calendar/providers/ics/moz.build
+++ b/calendar/providers/ics/moz.build
@@ -3,8 +3,10 @@
 # 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/.
 
 EXTRA_COMPONENTS += [
     'calICSCalendar.js',
     'calICSCalendar.manifest',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Provider: ICS/WebDAV')

--- a/calendar/providers/storage/moz.build
+++ b/calendar/providers/storage/moz.build
@@ -8,8 +8,10 @@ EXTRA_COMPONENTS += [
     'calStorageCalendar.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'calStorageHelpers.jsm',
     'calStorageUpgrade.jsm',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Provider: Local Storage')

--- a/calendar/providers/wcap/moz.build
+++ b/calendar/providers/wcap/moz.build
@@ -5,8 +5,10 @@
 
 DIRS += ['public']
 
 EXTRA_COMPONENTS += [
     'calWcapCalendarModule.js',
     'calWcapCalendarModule.manifest',
 ]
 
+with Files('**'):
+    BUG_COMPONENT = ('Calendar', 'Provider: WCAP')

--- a/calendar/resources/moz.build
+++ b/calendar/resources/moz.build
@@ -7,8 +7,14 @@ JAR_MANIFESTS += ['jar.mn']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DEFINES['THEME'] = 'osx'
 else:
     DEFINES['THEME'] = 'windows'
 
 if CONFIG['MOZ_UPDATER']:
     DEFINES['MOZ_UPDATER'] = 1
+
+with Files('content/*'):
+    BUG_COMPONENT = ('Calendar', 'Dialogs')
+
+with Files('content/datetimepickers/*'):
+    BUG_COMPONENT = ('Calendar', 'Calendar Views')

new file mode 100644
--- /dev/null
+++ b/moz.build
@@ -0,0 +1,7 @@
+# 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/.
+
+# This file needs to stay here even if empty so that mach will work,
+# specifically commands like mach file-info.