diff --git a/common/bootstrap.js b/common/bootstrap.js
index a5b25deb..37d18ee5 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -254,7 +254,8 @@ function init() {
         bootstrap = bootstrap_jsm;
     else {
         bootstrap = Cu.Sandbox(Cc["@mozilla.org/systemprincipal;1"].createInstance(),
-                               { sandboxName: BOOTSTRAP });
+                               { sandboxName: BOOTSTRAP,
+                                 metadata: { addonID: addon.id } });
         Services.scriptloader.loadSubScript(BOOTSTRAP, bootstrap);
     }
     bootstrap.require = JSMLoader.load("base").require;