diff --git a/Gruntfile.js b/Gruntfile.js
index 58b8d9d..484ddd3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -22,8 +22,7 @@ module.exports = function(grunt) {
     }
   });
 
-  grunt.loadNpmTasks('grunt-trimtrailingspaces');
-  grunt.loadNpmTasks('grunt-contrib-watch');
+  require('load-grunt-tasks')(grunt);
 
   grunt.registerTask('default', []);
   grunt.loadTasks('tasks');
diff --git a/package.json b/package.json
index 19b6ab9..e9d1ef5 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
   "dependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-watch": "^0.6.1",
-    "grunt-trimtrailingspaces": "^0.4.0"
+    "grunt-trimtrailingspaces": "^0.4.0",
+    "load-grunt-tasks": "^0.6.0"
   }
 }