diff --git a/Gruntfile.js b/Gruntfile.js
index c30317b0..f1c45cf7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -77,6 +77,14 @@ module.exports = grunt => {
       }
     },
 
+    exec: {
+      firefoxExtensionPack: {
+        command: 'node_modules/web-ext/bin/web-ext build ' + 
+                 '--source-dir=dist/extension --artifacts-dir=dist ' + 
+                 '--overwrite-dest'
+      }
+    },
+
     stylus: {
       website: {
         files: {
@@ -217,7 +225,8 @@ module.exports = grunt => {
     'copy:extension',
     'build-extension-views',
     'webpack:extensionProd',
-    'crx:pack'
+    'crx:pack',
+    'exec:firefoxExtensionPack'
   ]);
   
   grunt.registerTask('build-extension-dev', [
diff --git a/package.json b/package.json
index f233259b..87b46a9b 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "source-map-support": "^0.5.3",
     "stylus": "^0.54.5",
     "uglifyjs-webpack-plugin": "^1.1.6",
+    "web-ext": "^2.4.0",
     "webpack": "^3.10.0",
     "webpack-merge": "^4.1.1",
     "xhr-mock": "^2.0.3"