diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index f7181e1c3..2df5fac60 100755
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -209,7 +209,6 @@ module.exports = (grunt) ->
   grunt.registerTask 'build-crx-channel', [
     'concat:crx'
     'copy:crx'
-    'crx:prod'
   ]
 
   grunt.registerTask 'build-crx', [
@@ -226,6 +225,15 @@ module.exports = (grunt) ->
     'clean:tmpcrx'
   ]
 
+  grunt.registerTask 'pack', [
+    'set-channel:stable'
+    'crx:prod'
+    'set-channel:beta'
+    'crx:prod'
+    'set-channel:noupdate'
+    'crx:prod'
+  ]
+
   grunt.registerTask 'build-userscript', [
     'set-build:userscript'
     'concat:coffee'
@@ -247,6 +255,7 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'tag', [
     'build'
+    'pack'
     'concat:meta'
     'copy:builds'
     'shell:commit'