diff --git a/package.json b/package.json
index 7fcaaf3865..bf9408ea02 100644
--- a/package.json
+++ b/package.json
@@ -194,8 +194,7 @@
     "benchmark": "npm run benchmark-with -- -f \".*benchmark.js\"",
     "tdd": "npm run test:karma -- --no-single-run --browsers Chrome",
     "package": "npm-run-all package:*",
-    "package:xpi": "npm run bundle && jpm xpi",
-    "package:dist": "mv activity-streams.xpi dist/activity-streams-$npm_package_version.xpi",
+    "package:dist": "npm run bundle && jpm xpi && mv activity-streams.xpi dist/activity-streams-$npm_package_version.xpi",
     "package:mozilla-central": "npm-run-all package:mozilla-central:*",
     "package:mozilla-central:unpack": "decompress dist/activity-streams-$npm_package_version.xpi -o dist/mozilla-central",
     "package:mozilla-central:copy": "cpx \"mozilla-central/**\" dist/mozilla-central",
diff --git a/yamscripts.yml b/yamscripts.yml
index 59bc03c47d..b3adb40ef8 100644
--- a/yamscripts.yml
+++ b/yamscripts.yml
@@ -78,8 +78,7 @@ scripts:
 
 # package: Build add-on
   package:
-    xpi: =>bundle && jpm xpi
-    dist: mv activity-streams.xpi dist/activity-streams-$npm_package_version.xpi
+    dist: =>bundle && jpm xpi && mv activity-streams.xpi dist/activity-streams-$npm_package_version.xpi
     mozilla-central:
       unpack: decompress dist/activity-streams-$npm_package_version.xpi -o dist/mozilla-central
       copy: cpx "mozilla-central/**" dist/mozilla-central