diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 268a8826c..9410f0c6b 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -132,15 +132,7 @@ module.exports = (grunt) ->
       tmpcrx: 'tmp-crx'
       tmpuserscript: 'tmp-userscript'
 
-  grunt.loadNpmTasks 'grunt-bump'
-  grunt.loadNpmTasks 'grunt-concurrent'
-  grunt.loadNpmTasks 'grunt-contrib-clean'
-  grunt.loadNpmTasks 'grunt-contrib-coffee'
-  grunt.loadNpmTasks 'grunt-contrib-compress'
-  grunt.loadNpmTasks 'grunt-contrib-concat'
-  grunt.loadNpmTasks 'grunt-contrib-copy'
-  grunt.loadNpmTasks 'grunt-contrib-watch'
-  grunt.loadNpmTasks 'grunt-shell'
+  require('matchdep').filterDev('grunt-*').forEach grunt.loadNpmTasks
 
   grunt.registerTask 'default', ['build']
 
diff --git a/package.json b/package.json
index b01920f2d..33b87d4d9 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
     "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-watch": "~0.5.0",
-    "grunt-shell": "~0.3.1"
+    "grunt-shell": "~0.3.1",
+    "matchdep": "~0.1.2"
   },
   "repository": {
     "type": "git",