diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 6f97306e8..4bcaf1282 100755
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -183,6 +183,17 @@ module.exports = (grunt) ->
           ./node_modules/.bin/npm-shrinkwrap --dev
         """.split('\n').join('&&')
 
+    webstore_upload:
+      accounts:
+        default:
+          publish: true
+          client_id: '<%= grunt.file.readJSON("../"+pkg.name+"-keys/chrome-store.json").installed.client_id %>'
+          client_secret: '<%= grunt.file.readJSON("../"+pkg.name+"-keys/chrome-store.json").installed.client_secret %>'
+      extensions:
+        extension:
+          appID: '<%= pkg.meta.chromeStoreID %>'
+          zip: 'builds/<%= pkg.name %>.zip'
+
     watch:
       options:
         interrupt: true
@@ -376,6 +387,10 @@ module.exports = (grunt) ->
     'shell:push'
   ]
 
+  grunt.registerTask 'store', [
+    'webstore_upload'
+  ]
+
   grunt.registerTask 'setversion', 'Set the version number', (version) ->
     pkg = grunt.file.readJSON 'package.json'
     oldversion = pkg.meta.version
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index aee77294d..bcd55ef8e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1027,6 +1027,24 @@
         }
       }
     },
+    "grunt-webstore-upload": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/grunt-webstore-upload/-/grunt-webstore-upload-0.8.2.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
+        },
+        "open": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
+        },
+        "q": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/q/-/q-1.2.0.tgz"
+        }
+      }
+    },
     "load-grunt-tasks": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/load-grunt-tasks/-/load-grunt-tasks-3.1.0.tgz",
diff --git a/package.json b/package.json
index 85f12a213..b549d36d5 100755
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",
     "faq": "https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions",
     "appid": "lacclbnghgdicfifcamcmcnilckjamag",
+    "chromeStoreID": "ohnjgmpcibpbafdlkimncjhflgedgpam",
     "recaptchaKey": "6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc",
     "youtubeAPIKey": "AIzaSyB5_zaen_-46Uhz1xGR-lz1YoUMHqCD6CE",
     "buildsPath": "builds/",
@@ -55,6 +56,7 @@
     "grunt-crx": "^0.3.4",
     "grunt-markdown": "^0.7.0",
     "grunt-shell": "^1.1.1",
+    "grunt-webstore-upload": "^0.8.2",
     "load-grunt-tasks": "^3.1.0",
     "npm-shrinkwrap": "^5.2.0"
   },