diff --git a/Gruntfile.js b/Gruntfile.js
index ec4e5f3d0..7ff32657b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -234,7 +234,9 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-composer');
 	grunt.loadNpmTasks('grunt-apigen');
 
-    grunt.registerTask('default', ['composer:update', 'apigen:generate', 'wiredep', 'bower_concat', 'bowercopy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
+    grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
     grunt.registerTask('genlicense', ['clean:license', 'license', 'bower-licensechecker']);
+    grunt.registerTask('packages', ['composer:update']);
+    grunt.registerTask('gendocs', ['apigen:generate']);
 
 };
diff --git a/package.json b/package.json
index bbad02351..934067057 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
     "wd": "^0.3.3"
   },
   "dependencies": {
-    "grunt-script-link-tags": "git://github.com/jekkos/grunt-script-link-tags.git#master",
-    "grunt-apigen": "git://github.com/daN4cat/grunt-apigen#master"
+    "grunt-script-link-tags": "git://github.com/jekkos/grunt-script-link-tags.git#master"
   }
 }