diff --git a/browser/app/moz.build b/browser/app/moz.build
index 947b8e57ad71..2fe622f773f8 100644
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -7,6 +7,9 @@
 with Files("**"):
     BUG_COMPONENT = ("Firefox", "General")
 
+with Files("blocklist.xml"):
+    BUG_COMPONENT = ("Toolkit", "Blocklist Implementation")
+
 with Files("firefox.exe.manifest"):
     BUG_COMPONENT = ("Core", "Widget: Win32")
 with Files("module.ver"):
diff --git a/services/common/tests/unit/test_blocklist_signatures/moz.build b/services/common/tests/unit/test_blocklist_signatures/moz.build
index bfcb92c7cdeb..1db2803b597a 100644
--- a/services/common/tests/unit/test_blocklist_signatures/moz.build
+++ b/services/common/tests/unit/test_blocklist_signatures/moz.build
@@ -12,3 +12,7 @@ test_certificates = (
 
 for test_certificate in test_certificates:
     GeneratedTestCertificate(test_certificate)
+
+with Files('**'):
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
+
diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build
index 19f5e6ea34cf..14bb42aa7899 100644
--- a/services/settings/dumps/blocklists/moz.build
+++ b/services/settings/dumps/blocklists/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Toolkit', 'Blocklisting')
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
 
 FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json',
                                                     'certificates.json',
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index ee2cc3d8a766..bf35eb781ae4 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -83,3 +83,10 @@ FINAL_LIBRARY = 'xul'
 
 with Files('**'):
     BUG_COMPONENT = ('Toolkit', 'Add-ons Manager')
+
+with Files('Blocklist.jsm'):
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
+
+with Files('content/blocklist**'):
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
+
diff --git a/xpcom/system/moz.build b/xpcom/system/moz.build
index 700ac2b0e109..201c4da1281e 100644
--- a/xpcom/system/moz.build
+++ b/xpcom/system/moz.build
@@ -19,3 +19,7 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'xpcom_system'
+
+with Files('nsIBlocklistService.idl'):
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
+