diff --git a/modules/@angular/compiler-cli/README.md b/modules/@angular/compiler-cli/README.md
index e2114334c1..1d78cb044c 100644
--- a/modules/@angular/compiler-cli/README.md
+++ b/modules/@angular/compiler-cli/README.md
@@ -41,9 +41,13 @@ coreBootstrap(MyComponentNgFactory, appInjector);
 The `tsconfig.json` file may contain an additional configuration block:
 ```
  "angularCompilerOptions": {
-   "genDir": "."
+   "genDir": ".",
+   "debug": true
  }
 ```
+
+### `genDir`
+
 the `genDir` option controls the path (relative to `tsconfig.json`) where the generated file tree
 will be written. If `genDir` is not set, then the code will be generated in the source tree, next
 to your original sources. More options may be added as we implement more features.
@@ -67,6 +71,11 @@ as well. This is by design, see https://github.com/Microsoft/TypeScript/issues/8
 This makes the configuration of your runtime module loader more complex, so we don't recommend
 this option yet.
 
+### `debug`
+
+Set the `debug` option to true to generate debug information in the generate files.
+Default to `false`.
+
 See the example in the `test/` directory for a working example.
 
 ## Compiler CLI
diff --git a/modules/@angular/compiler-cli/integrationtest/tsconfig.json b/modules/@angular/compiler-cli/integrationtest/tsconfig.json
index bd2002f1d3..01090a2570 100644
--- a/modules/@angular/compiler-cli/integrationtest/tsconfig.json
+++ b/modules/@angular/compiler-cli/integrationtest/tsconfig.json
@@ -2,7 +2,8 @@
     "angularCompilerOptions": {
       // For TypeScript 1.8, we have to lay out generated files
       // in the same source directory with your code.
-      "genDir": "."
+      "genDir": ".",
+      "debug": true
     },
 
     "compilerOptions": {
diff --git a/modules/@angular/compiler-cli/src/codegen.ts b/modules/@angular/compiler-cli/src/codegen.ts
index 0248e1daa7..3c4f5b2c3c 100644
--- a/modules/@angular/compiler-cli/src/codegen.ts
+++ b/modules/@angular/compiler-cli/src/codegen.ts
@@ -152,7 +152,7 @@ export class CodeGenerator {
     StaticAndDynamicReflectionCapabilities.install(staticReflector);
     const htmlParser = new HtmlParser();
     const config = new compiler.CompilerConfig({
-      genDebugInfo: true,
+      genDebugInfo: options.debug === true,
       defaultEncapsulation: ViewEncapsulation.Emulated,
       logBindingUpdate: false,
       useJit: false,
diff --git a/modules/@angular/compiler/src/config.ts b/modules/@angular/compiler/src/config.ts
index dafa196dfa..171bfcec8d 100644
--- a/modules/@angular/compiler/src/config.ts
+++ b/modules/@angular/compiler/src/config.ts
@@ -1,7 +1,7 @@
 import {ViewEncapsulation} from '@angular/core';
 
 import {unimplemented} from '../src/facade/exceptions';
-import {Type, assertionsEnabled, isBlank} from '../src/facade/lang';
+import {assertionsEnabled} from '../src/facade/lang';
 
 import {CompileIdentifierMetadata} from './compile_metadata';
 import {Identifiers} from './identifiers';
diff --git a/tools/@angular/tsc-wrapped/src/collector.ts b/tools/@angular/tsc-wrapped/src/collector.ts
index 0506d68e58..1b7a4b2cc5 100644
--- a/tools/@angular/tsc-wrapped/src/collector.ts
+++ b/tools/@angular/tsc-wrapped/src/collector.ts
@@ -1,6 +1,6 @@
 import * as ts from 'typescript';
 
-import {Evaluator, ImportMetadata, ImportSpecifierMetadata, errorSymbol, isPrimitive} from './evaluator';
+import {Evaluator, errorSymbol, isPrimitive} from './evaluator';
 import {ClassMetadata, ConstructorMetadata, MemberMetadata, MetadataError, MetadataMap, MetadataSymbolicExpression, MetadataSymbolicReferenceExpression, MetadataValue, MethodMetadata, ModuleMetadata, VERSION, isMetadataError, isMetadataSymbolicReferenceExpression} from './schema';
 import {Symbols} from './symbols';
 
diff --git a/tools/@angular/tsc-wrapped/src/options.ts b/tools/@angular/tsc-wrapped/src/options.ts
index 2034f5f553..9275b5a68d 100644
--- a/tools/@angular/tsc-wrapped/src/options.ts
+++ b/tools/@angular/tsc-wrapped/src/options.ts
@@ -15,6 +15,9 @@ interface Options extends ts.CompilerOptions {
 
   // Print extra information while running the compiler
   trace: boolean;
+
+  // Whether to embed debug information in the compiled templates
+  debug?: boolean;
 }
 
 export default Options;