diff --git a/Gruntfile.js b/Gruntfile.js
index b91036b262..ffc3190d39 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,6 +4,9 @@ module.exports = function(grunt) {
 	var SOURCE_DIR = 'src/';
 	var BUILD_DIR = 'build/';
 
+	// Load tasks. 
+	require('matchdep').filterDev('grunt-*').forEach( grunt.loadNpmTasks );
+
 	// Project configuration.
 	grunt.initConfig({
 		clean: {
@@ -154,16 +157,6 @@ module.exports = function(grunt) {
 		}
 	});
 
-	// Load tasks.
-	grunt.loadNpmTasks('grunt-contrib-clean');
-	grunt.loadNpmTasks('grunt-contrib-copy');
-	grunt.loadNpmTasks('grunt-contrib-cssmin');
-	grunt.loadNpmTasks('grunt-contrib-qunit');
-	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-contrib-watch');
-	grunt.loadNpmTasks('grunt-contrib-compress');
-	grunt.loadNpmTasks('grunt-contrib-concat');
-
 	// Register tasks.
 	grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'uglify:core',
 		'uglify:tinymce', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
diff --git a/package.json b/package.json
index d4408e2fa9..9a72ae1e34 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "grunt-contrib-uglify": "~0.2.2",
     "grunt-contrib-watch": "~0.5.1",
     "grunt-contrib-compress": "~0.5.2",
-    "grunt-contrib-concat": "~0.3.0"
+    "grunt-contrib-concat": "~0.3.0",
+    "matchdep": "~0.1.2"
   }
 }