diff --git a/templates/common/root/_Gruntfile.js b/templates/common/root/_Gruntfile.js
index 3e24db6dc..13cc0920c 100644
--- a/templates/common/root/_Gruntfile.js
+++ b/templates/common/root/_Gruntfile.js
@@ -51,7 +51,7 @@ module.exports = function (grunt) {
       },<% } else { %>
       js: {
         files: ['<%%= yeoman.app %>/scripts/{,*/}*.js'],
-        tasks: ['newer:jshint:all'],
+        tasks: ['ngdocs', 'newer:jshint:all'],
         options: {
           livereload: '<%%= connect.options.livereload %>'
         }
@@ -521,6 +521,13 @@ module.exports = function (grunt) {
           %>',
         singleRun: true
       }
+    },
+    ngdocs: {
+      options: {
+        dest: '.tmp/docs',
+        html5Mode: false
+      },
+      api: ['<%%= yeoman.app %>/scripts/{,*/}*.js'],
     }
   });
 
@@ -534,7 +541,7 @@ module.exports = function (grunt) {
       'clean:server',
       'wiredep',
       'concurrent:server',
-      'autoprefixer:server',
+      'ngdocs',
       'connect:livereload',
       'watch'
     ]);
diff --git a/templates/common/root/_package.json b/templates/common/root/_package.json
index c32ae91b0..bfd6a0c21 100644
--- a/templates/common/root/_package.json
+++ b/templates/common/root/_package.json
@@ -29,7 +29,8 @@
     "grunt-wiredep": "^2.0.0",
     "jshint-stylish": "^1.0.0",
     "load-grunt-tasks": "^3.1.0",
-    "time-grunt": "^1.0.0"
+    "time-grunt": "^1.0.0",
+    "grunt-ngdocs": "~0.1.7"
   },
   "engines": {
     "node": ">=0.10.0"