diff --git a/build.sh b/build.sh
index 148c22b5f0..02861fd8a2 100755
--- a/build.sh
+++ b/build.sh
@@ -235,9 +235,9 @@ do
     $TSC -p ${SRCDIR}/tsconfig-static.json
   fi
 
-  if [[ -e ${SRCDIR}/tsconfig-2015.json ]]; then
-    echo "======      [${PACKAGE}]: COMPILING (ES2015): ${TSC} -p ${SRCDIR}/tsconfig-2015.json"
-    ${TSC} -p ${SRCDIR}/tsconfig-2015.json
+  if [[ -e ${SRCDIR}/tsconfig-esm5.json ]]; then
+    echo "======      [${PACKAGE}]: COMPILING (ESM/ES5): ${TSC} -p ${SRCDIR}/tsconfig-esm5.json"
+    ${TSC} -p ${SRCDIR}/tsconfig-esm5.json
   fi
 
   if [[ ${PACKAGE} == benchpress ]]; then
diff --git a/modules/@angular/compiler-cli/tsconfig-2015.json b/modules/@angular/compiler-cli/tsconfig-esm5.json
similarity index 100%
rename from modules/@angular/compiler-cli/tsconfig-2015.json
rename to modules/@angular/compiler-cli/tsconfig-esm5.json
diff --git a/modules/@angular/compiler/tsconfig-2015.json b/modules/@angular/compiler/tsconfig-2015.json
deleted file mode 100644
index d5c44ac302..0000000000
--- a/modules/@angular/compiler/tsconfig-2015.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig-build",
-  "compilerOptions": {
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../../dist/esm/compiler"
-  }
-}
diff --git a/modules/@angular/compiler/tsconfig-esm5.json b/modules/@angular/compiler/tsconfig-esm5.json
new file mode 100644
index 0000000000..e86a8362e4
--- /dev/null
+++ b/modules/@angular/compiler/tsconfig-esm5.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig-build",
+  "compilerOptions": {
+    "outDir": "../../../dist/esm/compiler",
+    "target": "es5"
+  }
+}
diff --git a/modules/@angular/core/tsconfig-2015.json b/modules/@angular/core/tsconfig-esm5.json
similarity index 63%
rename from modules/@angular/core/tsconfig-2015.json
rename to modules/@angular/core/tsconfig-esm5.json
index 8df66c0e98..2265ab6574 100644
--- a/modules/@angular/core/tsconfig-2015.json
+++ b/modules/@angular/core/tsconfig-esm5.json
@@ -1,9 +1,8 @@
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
-      "module": "es2015",
-      "moduleResolution": "node",
-      "outDir": "../../../dist/esm/core"
+      "outDir": "../../../dist/esm/core",
+      "target": "es5"
   },
   "files": [
     "index.ts",