diff --git a/scripts/generate-docs.sh b/scripts/generate-docs.sh
index 89ea90fc2..a09e93bbf 100755
--- a/scripts/generate-docs.sh
+++ b/scripts/generate-docs.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 cd "$( dirname "${BASH_SOURCE[0]}" )/.."
-cd testapp && npm install
-
-cd ../website
 
 # Check that directory is clean
 if [ $(git status --porcelain | wc -l) != "0" ]; then
@@ -10,44 +7,109 @@ if [ $(git status --porcelain | wc -l) != "0" ]; then
   echo "We cannot push the generated docs unless the working directory is" 1>&2
   echo "clean.  Either commit your changes, stash them, or generate the" 1>&2
   echo "docs manually by running gulp in /website/ and push them to" 1>&2
-  echo "gh-pages at a later date" 1>&2
+  echo "gh-pages at a later date." 1>&2
   echo -e "\033[0m" 1>&2 # Normal color
   exit 1
 fi
 
-# Switch to the branch were the version was bumped
-VERSION=$(node ../scripts/get-version.js)
+echo "Switching to last release..."
+VERSION=$(node scripts/get-version.js)
 EXEC_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 git checkout "${VERSION}"
 if [ $? -ne 0 ]; then
   echo -e "\033[0;31m" 1>&2 # Red
   echo "The package.json file indicates that the current version is" 1>&2
-  echo "\"${VERSION}\", but there is no corresponding git tag" 1>&2
+  echo "\"${VERSION}\", but there is no corresponding git tag." 1>&2
+  echo -e "\033[0m" 1>&2 # Normal Color
+  git checkout "${EXEC_BRANCH}"
+  exit 1
+fi
+
+echo "Removing temp files..."
+git clean -fxd
+if [ $? -ne 0 ]; then
+  echo -e "\033[0;31m" 1>&2 # Red
+  echo "Could not remove untracked/ignored files."
+  echo -e "\033[0m" 1>&2 # Normal Color
+  git checkout "${EXEC_BRANCH}"
+  exit 1
+fi
+
+echo "Main \`npm install\`..."
+npm install
+if [ $? -ne 0 ]; then
+  echo -e "\033[0;31m" 1>&2 # Red
+  echo "\`npm install\` failed."
+  echo -e "\033[0m" 1>&2 # Normal Color
+  git checkout "${EXEC_BRANCH}"
+  exit 1
+fi
+
+echo "Getting types for es6 promises..."
+npm install @types/es6-promise
+if [ $? -ne 0 ]; then
+  echo -e "\033[0;31m" 1>&2 # Red
+  echo "Couldn't get types for es6 promises."
+  echo -e "\033[0m" 1>&2 # Normal Color
+  git checkout "${EXEC_BRANCH}"
+  exit 1
+fi
+
+echo "Compiling down to es5..."
+node node_modules/typescript/bin/tsc --target es5
+if [ $? -ne 0 ]; then
+  echo -e "\033[0;31m" 1>&2 # Red
+  echo "Couldn't compile for es5."
+  echo -e "\033[0m" 1>&2 # Normal Color
+  git checkout "${EXEC_BRANCH}"
+  exit 1
+fi
+
+# Remove unneeded type
+npm remove @types/es6-promise
+
+echo "Installing the testapp..."
+npm run install_testapp
+if [ $? -ne 0 ]; then
+  echo -e "\033[0;31m" 1>&2 # Red
+  echo "Couldn't install testapp."
+  echo -e "\033[0m" 1>&2 # Normal Color
+  git checkout "${EXEC_BRANCH}"
+  exit 1
+fi
+
+echo "Installing the website..."
+cd website
+npm install
+if [ $? -ne 0 ]; then
+  echo -e "\033[0;31m" 1>&2 # Red
+  echo "Failed to install website dependencies."
   echo -e "\033[0m" 1>&2 # Normal Color
+  git checkout "${EXEC_BRANCH}"
   exit 1
 fi
 
 
-# Generate files
+echo "Building the website..."
 npm run build
 if [ $? -ne 0 ]; then
   echo -e "\033[0;31m" 1>&2 # Red
-  echo "Build failed. Try running 'npm install' in /website/." 1>&2
+  echo "Website build failed."
   echo -e "\033[0m" 1>&2 # Normal Color
+  git checkout "${EXEC_BRANCH}"
   exit 1
 fi
 
-# Transfer files to gh-pages
+echo "Transfering files to gh-pages..."
 cd ".."
 git branch -D gh-pages
-git branch gh-pages
+git pull -f https://github.com/angular/protractor.git gh-pages:gh-pages
 git checkout gh-pages
-git pull https://github.com/angular/protractor.git gh-pages:gh-pages -f
 git reset --hard
 cp -r website/build/* .
 git add -A
 git commit -m "chore(website): automatic docs update for ${VERSION}"
 echo -e "\033[0;32m" # Green
-echo "Created update commit in gh-pages branch"
+echo "Created update commit in gh-pages branch."
 echo -e "\033[0m" 1>&2 # Normal Color
 git checkout "${EXEC_BRANCH}"