diff --git a/package.json b/package.json
index e2fd04e..6d00c78 100644
--- a/package.json
+++ b/package.json
@@ -6,13 +6,14 @@
   "scripts": {
     "create-dirs": "mkdir -p build/assets build/lib",
     "build-extensions": "",
-    "build-firefox": "cd firefox/ && jpm xpi",
-    "build-chrome": "chromium-browser --pack-extension=./ --pack-extension-key=key.pem",
+    "build-firefox": "cd firefox/ && jpm xpi && cd -",
+    "build-chrome": "chromium-browser --pack-extension=chrome/ --pack-extension-key=key.pem",
     "build-js": "browserify -t reactify src/index.js -o build/index.js",
+    "build-data": "python firefox/build-package.py && python chrome/build-manifest.py",
     "copy-firefox": "",
     "copy-chrome": "",
     "build": "ulimit -n 512 && npm run create-dirs && npm install && npm run build-js && npm run copy-firefox && npm run copy-chrome",
-    "clean": "rm -rf build/ && rm -rf firefox/data",
+    "clean": "rm -rf build/ && rm -rf firefox/data && rm -rf chrome/data",
   },
   "repository": {
     "type": "git",