diff --git a/modules/@angular/compiler-cli/tsconfig-2015.json b/modules/@angular/compiler-cli/tsconfig-2015.json
index d55b4b722a..eb0fc3b16c 100644
--- a/modules/@angular/compiler-cli/tsconfig-2015.json
+++ b/modules/@angular/compiler-cli/tsconfig-2015.json
@@ -6,7 +6,7 @@
         "noImplicitAny": true,
         "module": "es2015",
         "moduleResolution": "node",
-        "outDir": "../../../dist/packages-dist/esm/compiler-cli",
+        "outDir": "../../../dist/esm/compiler-cli",
         "paths": {
           "@angular/core": ["../../../dist/packages-dist/core"],
           "@angular/common": ["../../../dist/packages-dist/common"],
diff --git a/modules/@angular/language-service/rollup.config.js b/modules/@angular/language-service/rollup.config.js
index c9457dfdee..c0e158ee5a 100644
--- a/modules/@angular/language-service/rollup.config.js
+++ b/modules/@angular/language-service/rollup.config.js
@@ -16,9 +16,10 @@ var esm = 'esm/';
 
 var locations = {
   'tsc-wrapped': normalize('../../../dist/tools/@angular') + '/',
+  'compiler-cli': normalize('../../../dist/esm') + '/'
 };
 
-var esm_suffixes = {'compiler-cli': esm};
+var esm_suffixes = {};
 
 function normalize(fileName) {
   return path.resolve(__dirname, fileName);