diff --git a/scripts/env.sh b/scripts/env.sh
index 8ba3b593d..dd01ad9be 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -29,7 +29,7 @@ export DART=${DART:-"$DARTSDK/bin/dart"}
 export PUB=${PUB:-"$DARTSDK/bin/pub"}
 export DARTANALYZER=${DARTANALYZER:-"$DARTSDK/bin/dartanalyzer"}
 export DARTDOC=${DARTDOC:-"$DARTSDK/bin/dartdoc"}
-
+export DART_DOCGEN=${DART_DOCGEN:-"$DARTSDK/bin/docgen"}
 
 export CHROME_CANARY_BIN=${CHROME_CANARY_BIN:-"$DARTIUM"}
 export CHROME_BIN=${CHROME_BIN:-"google-chrome"}
diff --git a/scripts/generate-documentation.sh b/scripts/generate-documentation.sh
index fbfb3153c..c6bf8bc48 100755
--- a/scripts/generate-documentation.sh
+++ b/scripts/generate-documentation.sh
@@ -1,8 +1,28 @@
 #!/bin/bash
 . $(dirname $0)/env.sh
-$DARTDOC \
+
+# Temporary during transition period from use of dartdoc to docgen.
+if [ -x "$DART_DOCGEN" ]; then
+    # docgen seems to freeze when it processes the angular.dart files
+    # https://code.google.com/p/dart/issues/detail?id=16752
+    # so disable it for now
+    # DOC_CMD="$DART_DOCGEN"
+    # MODE_OPTION=
+    echo "DISABLING DOCUMENT GENERATION due to isses with docgen."
+    echo "https://code.google.com/p/dart/issues/detail?id=16752"
+    echo "----"
+    echo "Reporting success none-the-less during this docgen beta period."
+    exit 0;
+elif [ -x "$DARTDOC" ]; then
+    DOC_CMD="$DARTDOC"
+    MODE_OPTION="--mode=static"
+fi
+
+echo "Generating documentation using $DOC_CMD"
+"$DOC_CMD" $MODE_OPTION \
     --package-root=packages/ \
     --out doc \
-    --mode=static \
     --exclude-lib=js,metadata,meta,mirrors,intl,number_symbols,number_symbol_data,intl_helpers,date_format_internal,date_symbols,angular.util \
-    packages/angular/angular.dart lib/mock/module.dart \
+    packages/angular/angular.dart lib/mock/module.dart
+
+