diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 535eb2bca..932c66989 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -123,7 +123,7 @@ module.exports = (grunt) ->
       tmpcrx: 'tmp-crx'
       tmpuserscript: 'tmp-userscript'
 
-  require('matchdep').filterDev('grunt-*').forEach grunt.loadNpmTasks
+  require('load-grunt-tasks') grunt
 
   grunt.registerTask 'default', ['build']
 
diff --git a/package.json b/package.json
index c5f16f29c..c801dadec 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-watch": "~0.5.0",
     "grunt-shell": "~0.3.1",
-    "matchdep": "~0.1.2"
+    "load-grunt-tasks": "~0.1.0"
   },
   "repository": {
     "type": "git",