diff --git a/common/bootstrap.js b/common/bootstrap.js
index 664aa14d..a1f6ca61 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -221,10 +221,11 @@ function init() {
     if (!manifest.categories)
         manifest.categories = [];
 
-    for (let [classID, { contract, path, category }] of Iterator(manifest.components || {})) {
+    for (let [classID, { contract, path, categories }] of Iterator(manifest.components || {})) {
         components[classID] = new FactoryProxy(getURI(path).spec, classID, contract);
-        if (category)
-            manifest.categories.push([category[0], category[1], contract]);
+        if (categories)
+            for (let [category, id] in Iterator(categories))
+                manifest.categories.push([category, id, contract]);
     }
 
     for (let [category, id, value] of manifest.categories) {
diff --git a/pentadactyl/config.json b/pentadactyl/config.json
index a5850ec3..dc1e8ec6 100644
--- a/pentadactyl/config.json
+++ b/pentadactyl/config.json
@@ -26,7 +26,9 @@
         "{16dc34f7-6d22-4aa4-a67f-2921fb5dcb69}": {
             "path": "components/commandline-handler.js",
             "contract": "@mozilla.org/commandlinehandler/general-startup;1?type=dactyl",
-            "category": ["command-line-handler", "m-dactyl"]
+            "categories": {
+                "command-line-handler": "m-dactyl"
+            }
         }
     },