diff --git a/node_modules/architect/architect.js b/node_modules/architect/architect.js
index 512f2994..17c5fe43 100644
--- a/node_modules/architect/architect.js
+++ b/node_modules/architect/architect.js
@@ -448,7 +448,8 @@ function Architect(config) {
             });
         }
         
-        var packageName = (plugin.packagePath || "").replace(/.*plugins\/([^\/]*)\/.*$/, "$1");
+        var m = /^plugins\/([^\/]+)|\/plugins\/[^\/]+\/([^\/]+)/.exec(plugin.packagePath);
+        var packageName = m && (m[1] || m[2]);
         if (!app.packages[packageName]) app.packages[packageName] = [];
         
         if (DEBUG) {