diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index dd7c6b18176e..000000000000
--- a/.bowerrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "directory": "bower_components",
-  "json": "bower.json"
-}
diff --git a/.gitignore b/.gitignore
index f68d8f483d4c..128b6efb5b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,7 @@ performance/temp*.html
 *.swp
 angular.js.tmproj
 /node_modules/
-/components/
-/bower_components/
+bower_components/
 angular.xcodeproj
 .idea
 .agignore
diff --git a/bower.json b/bower.json
index 62f25d85851c..e1f774b6f6a6 100644
--- a/bower.json
+++ b/bower.json
@@ -2,11 +2,7 @@
   "name": "AngularJS",
   "devDependencies": {
     "jquery": "2.1.1",
-    "lunr.js": "0.4.3",
-    "open-sans-fontface": "1.0.4",
-    "google-code-prettify": "1.0.1",
     "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",
-    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip",
-    "bootstrap": "3.1.1"
+    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
   }
 }
diff --git a/docs/bower.json b/docs/bower.json
new file mode 100644
index 000000000000..db88bffd5733
--- /dev/null
+++ b/docs/bower.json
@@ -0,0 +1,10 @@
+{
+  "name": "AngularJS-docs-app",
+  "dependencies": {
+    "jquery": "2.1.1",
+    "lunr.js": "0.4.3",
+    "open-sans-fontface": "1.0.4",
+    "google-code-prettify": "1.0.1",
+    "bootstrap": "3.1.1"
+  }
+}
diff --git a/docs/docs.config.js b/docs/docs.config.js
index 4853a3eefa25..5188cc5a9e3d 100644
--- a/docs/docs.config.js
+++ b/docs/docs.config.js
@@ -1,3 +1,5 @@
+"use strict";
+
 var path = require('canonical-path');
 var versionInfo = require('../lib/versions/version-info');
 var basePath = __dirname;
@@ -9,9 +11,10 @@ module.exports = function(config) {
   var cdnUrl = "//ajax.googleapis.com/ajax/libs/angularjs/" + versionInfo.cdnVersion;
 
   var getVersion = function(component, sourceFolder, packageFile) {
-    sourceFolder = sourceFolder || '../bower_components';
+    sourceFolder = sourceFolder || './bower_components';
     packageFile = packageFile || 'bower.json';
-    return require(path.join(sourceFolder,component,packageFile)).version;
+
+    return require(path.resolve(sourceFolder,component,packageFile)).version;
   };
 
 
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index e90cf872ca6f..4de976777d1e 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -1,4 +1,7 @@
+"use strict";
+
 var gulp = require('gulp');
+var log = require('gulp-util').log;
 var concat = require('gulp-concat');
 var jshint = require('gulp-jshint');
 var bower = require('bower');
@@ -12,7 +15,7 @@ var path = require('canonical-path');
 // See clean and bower for async tasks, and see assets and doc-gen for dependent tasks below
 
 var outputFolder = '../build/docs';
-var bowerFolder = '../bower_components';
+var bowerFolder = 'bower_components';
 
 
 var copyComponent = function(component, pattern, sourceFolder, packageFile) {
@@ -26,7 +29,14 @@ var copyComponent = function(component, pattern, sourceFolder, packageFile) {
 };
 
 gulp.task('bower', function() {
-  return bower.commands.install();
+  var bowerTask = bower.commands.install();
+  bowerTask.on('log', function (result) {
+    log('bower:', result.id, result.data.endpoint.name);
+  });
+  bowerTask.on('error', function(error) {
+    log(error);
+  });
+  return bowerTask;
 });
 
 gulp.task('build-app', function() {
@@ -48,7 +58,7 @@ gulp.task('assets', ['bower'], function() {
 });
 
 
-gulp.task('doc-gen', function() {
+gulp.task('doc-gen', ['bower'], function() {
   var generateDocs = dgeni.generator('docs.config.js');
   return generateDocs()
     .catch(function(error) {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 944115a0f8e4..ec9ba4ac5b61 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2931,6 +2931,180 @@
         }
       }
     },
+    "gulp-util": {
+      "version": "3.0.1",
+      "dependencies": {
+        "chalk": {
+          "version": "0.5.1",
+          "dependencies": {
+            "ansi-styles": {
+              "version": "1.1.0"
+            },
+            "escape-string-regexp": {
+              "version": "1.0.1"
+            },
+            "has-ansi": {
+              "version": "0.1.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "strip-ansi": {
+              "version": "0.3.0",
+              "dependencies": {
+                "ansi-regex": {
+                  "version": "0.2.1"
+                }
+              }
+            },
+            "supports-color": {
+              "version": "0.2.0"
+            }
+          }
+        },
+        "dateformat": {
+          "version": "1.0.8-1.2.3"
+        },
+        "lodash": {
+          "version": "2.4.1"
+        },
+        "lodash._reinterpolate": {
+          "version": "2.4.1"
+        },
+        "lodash.template": {
+          "version": "2.4.1",
+          "dependencies": {
+            "lodash.defaults": {
+              "version": "2.4.1",
+              "dependencies": {
+                "lodash._objecttypes": {
+                  "version": "2.4.1"
+                }
+              }
+            },
+            "lodash.escape": {
+              "version": "2.4.1",
+              "dependencies": {
+                "lodash._escapehtmlchar": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._htmlescapes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash._reunescapedhtml": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._htmlescapes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                }
+              }
+            },
+            "lodash._escapestringchar": {
+              "version": "2.4.1"
+            },
+            "lodash.keys": {
+              "version": "2.4.1",
+              "dependencies": {
+                "lodash._isnative": {
+                  "version": "2.4.1"
+                },
+                "lodash.isobject": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._objecttypes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                },
+                "lodash._shimkeys": {
+                  "version": "2.4.1",
+                  "dependencies": {
+                    "lodash._objecttypes": {
+                      "version": "2.4.1"
+                    }
+                  }
+                }
+              }
+            },
+            "lodash.templatesettings": {
+              "version": "2.4.1"
+            },
+            "lodash.values": {
+              "version": "2.4.1"
+            }
+          }
+        },
+        "minimist": {
+          "version": "1.1.0"
+        },
+        "multipipe": {
+          "version": "0.1.1",
+          "dependencies": {
+            "duplexer2": {
+              "version": "0.0.2",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.13",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "through2": {
+          "version": "0.6.1",
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.31",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "xtend": {
+              "version": "4.0.0"
+            }
+          }
+        },
+        "vinyl": {
+          "version": "0.4.3",
+          "dependencies": {
+            "clone-stats": {
+              "version": "0.0.1"
+            }
+          }
+        }
+      }
+    },
     "jasmine-node": {
       "version": "1.11.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 1068e00c8ffa..3d5d1a5352fa 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "gulp": "~3.8.0",
     "gulp-concat": "~2.1.7",
     "gulp-jshint": "~1.4.2",
+    "gulp-util": "^3.0.1",
     "jasmine-node": "~1.11.0",
     "jasmine-reporters": "~0.2.1",
     "jshint-stylish": "~0.1.5",