diff --git a/Gruntfile.js b/Gruntfile.js
index 469e0fda14..1dbc61a1ca 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,12 +10,39 @@ module.exports = function(grunt) {
         separator: ';\n'
       },
       dist: {
-        src: buildConfig.ionicFiles,
+        src: buildConfig.ionicFiles.concat(buildConfig.angularIonicFiles),
         dest: 'dist/js/ionic.js'
       },
-      distAngular: {
-        src: buildConfig.angularIonicFiles,
-        dest: 'dist/js/ionic-angular.js'
+      bundle: {
+        options: {
+          banner: grunt.file.read('js/_license.js') + '\n' +
+            '/*!\n' +
+            ' * ionic.bundle.js is a concatenation of:\n' +
+            ' * angular.js,\n'+
+            ' * angular-animate.js,\n'+
+            ' * angular-ui-router.js,\n'+
+            ' * ionic.js\n'+
+            ' */\n\n'
+        },
+        src: [
+          'config/lib/js/angular/angular.js',
+          'config/lib/js/angular/angular-animate.js',
+          'config/lib/js/angular-ui/angular-ui-router.js',
+          'dist/js/ionic.js'
+        ],
+        dest: 'dist/js/ionic.bundle.js'
+      },
+      bundlemin: {
+        options: {
+          banner: '<%= concat.bundle.options.banner %>'
+        },
+        src: [
+          'config/lib/js/angular/angular.js',
+          'config/lib/js/angular/angular-animate.min.js',
+          'config/lib/js/angular-ui/angular-ui-router.min.js',
+          'dist/js/ionic.min.js'
+        ],
+        dest: 'dist/js/ionic.bundle.min.js'
       }
     },
 
@@ -44,8 +71,7 @@ module.exports = function(grunt) {
     'removelogging': {
       dist: {
         files: {
-          'dist/js/ionic.js': 'dist/js/ionic.js',
-          'dist/js/ionic-angular.js': 'dist/js/ionic-angular.js'
+          'dist/js/ionic.js': 'dist/js/ionic.js'
         },
         options: {
           methods: 'log assert count clear group groupEnd groupCollapsed trace debug dir dirxml profile profileEnd time timeEnd timeStamp table exception'.split(' ')
@@ -82,8 +108,7 @@ module.exports = function(grunt) {
     uglify: {
       dist: {
         files: {
-          'dist/js/ionic.min.js': 'dist/js/ionic.js',
-          'dist/js/ionic-angular.min.js': 'dist/js/ionic-angular.js'
+          'dist/js/ionic.min.js': 'dist/js/ionic.js'
         }
       },
       options: {
@@ -111,11 +136,7 @@ module.exports = function(grunt) {
       version: {
         files: {
           'dist/js/ionic.js': 'dist/js/ionic.js',
-          'dist/js/ionic.min.js': 'dist/js/ionic.min.js',
-          'dist/js/ionic-angular.js': 'dist/js/ionic-angular.js',
-          'dist/js/ionic-angular.min.js': 'dist/js/ionic-angular.min.js',
           'dist/css/ionic.css': 'dist/css/ionic.css',
-          'dist/css/ionic.min.css': 'dist/css/ionic.min.css'
         },
         options: {
           replacements: [{
@@ -138,7 +159,7 @@ module.exports = function(grunt) {
     watch: {
       scripts: {
         files: ['js/**/*.js', 'ext/**/*.js'],
-        tasks: ['concat', 'string-replace'],
+        tasks: ['concat:dist', 'string-replace'],
         options: {
           spawn: false
         }
@@ -165,11 +186,13 @@ module.exports = function(grunt) {
   grunt.registerTask('build', [
     'sass',
     'cssmin',
-    'concat',
+    'concat:dist',
     'copy',
-    'uglify',
     'string-replace',
+    'uglify',
     'version',
+    'concat:bundle',
+    'concat:bundlemin'
   ]);
 
   grunt.registerMultiTask('karma', 'Run karma', function() {
diff --git a/js/_license.js b/js/_license.js
index 3cd47cca0b..224b8d297a 100644
--- a/js/_license.js
+++ b/js/_license.js
@@ -10,4 +10,4 @@
  *
  * Licensed under the MIT license. Please see LICENSE for more information.
  *
- */
\ No newline at end of file
+ */