diff --git a/modules/@angular/router/karma.conf.js b/modules/@angular/router/karma.conf.js
index 6abac67477..13f3598d28 100644
--- a/modules/@angular/router/karma.conf.js
+++ b/modules/@angular/router/karma.conf.js
@@ -38,6 +38,10 @@ module.exports = function(config) {
       {pattern: 'dist/**/*.js.map', included: false, watched: false}
     ],
 
+    preprocessors: {
+      '**/*.js': ['sourcemap']
+    },
+
     reporters: ['mocha'],
     port: 9876,
     colors: true,
diff --git a/modules/@angular/router/package.json b/modules/@angular/router/package.json
index 6628ecad92..99d8b5e13b 100644
--- a/modules/@angular/router/package.json
+++ b/modules/@angular/router/package.json
@@ -53,6 +53,7 @@
     "karma-jasmine": "^0.3.6",
     "karma-mocha-reporter": "^2.0.2",
     "karma-systemjs": "^0.10.0",
+    "karma-sourcemap-loader": "~0.3",
     "parse5": "^1.3.2",
     "protractor": "3.0.0",
     "reflect-metadata": "0.1.2",
diff --git a/modules/@angular/router/tsconfig.json b/modules/@angular/router/tsconfig.json
index e1f084383f..673c53eef4 100644
--- a/modules/@angular/router/tsconfig.json
+++ b/modules/@angular/router/tsconfig.json
@@ -7,8 +7,8 @@
     "noImplicitAny": false,
     "outDir": "dist",
     "rootDir": ".",
-    "sourceMap": true,
-    "sourceRoot": "./",
+    "inlineSourceMap": true,
+    "inlineSources": true,
     "declaration": true,
     "removeComments": true
   },
diff --git a/modules/@angular/router/tsconfig.publish.es5.json b/modules/@angular/router/tsconfig.publish.es5.json
index ad9b7eea36..96d01c80d3 100644
--- a/modules/@angular/router/tsconfig.publish.es5.json
+++ b/modules/@angular/router/tsconfig.publish.es5.json
@@ -7,9 +7,9 @@
     "target": "es5",
     "noImplicitAny": false,
     "outDir": "dist",
-    "rootDir": "src",
-    "sourceMap": true,
-    "sourceRoot": "./",
+    "rootDir": ".",
+    "inlineSourceMap": true,
+    "inlineSources": true,
     "declaration": true,
     "removeComments": true
   },
diff --git a/modules/@angular/router/tsconfig.publish.es6.json b/modules/@angular/router/tsconfig.publish.es6.json
index f1ab75f1be..d5a4368f51 100644
--- a/modules/@angular/router/tsconfig.publish.es6.json
+++ b/modules/@angular/router/tsconfig.publish.es6.json
@@ -6,9 +6,9 @@
     "target": "es6",
     "noImplicitAny": false,
     "outDir": "dist/es6",
-    "rootDir": "src",
-    "sourceMap": true,
-    "sourceRoot": "./",
+    "rootDir": ".",
+    "inlineSourceMap": true,
+    "inlineSources": true,
     "declaration": true,
     "removeComments": true,
     "moduleResolution": "node"