diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index 5831faf..19c5f08 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -9,12 +9,14 @@
 
 module.exports = function (grunt) {
 
-  // Load grunt tasks automatically
-  require('load-grunt-tasks')(grunt);
-
   // Time how long tasks take. Can help when optimizing build times
   require('time-grunt')(grunt);
 
+  // Automatically load required Grunt tasks
+  require('jit-grunt')(grunt, {
+    useminPrepare: 'grunt-usemin'
+  });
+
   // Configurable paths
   var config = {
     app: 'app',
diff --git a/app/templates/_package.json b/app/templates/_package.json
index da780a4..a549322 100644
--- a/app/templates/_package.json
+++ b/app/templates/_package.json
@@ -23,7 +23,7 @@
     "grunt-newer": "~0.6.0",
     "grunt-svgmin": "~0.4.0",
     "grunt-concurrent": "~0.5.0",
-    "load-grunt-tasks": "~0.2.0",
+    "jit-grunt": "^0.9.1",
     "time-grunt": "~0.3.1",
     "jshint-stylish": "~0.1.5",
     "grunt-chrome-manifest": "~0.2.0",