diff --git a/modules/@angular/router/package.json b/modules/@angular/router/package.json
index 5ba069e348..49a8aa9cfc 100644
--- a/modules/@angular/router/package.json
+++ b/modules/@angular/router/package.json
@@ -12,7 +12,7 @@
     "build_npm": "rm -rf dist && tsc -p tsconfig.publish.es5.json && tsc -p tsconfig.publish.es6.json",
     "postbuild_npm": "cp package.json README.md dist/ && npm run rewrite_npm_package",
     "rewrite_npm_package": "node --harmony_destructuring tools/rewrite-published-package.js",
-    "build_bundle": "cp -r src router && tsc typings/main.d.ts src/router.ts --rootDir . --module system -t es5 --outFile dist/bundles/router.js  --moduleResolution node --emitDecoratorMetadata --experimentalDecorators"
+    "build_bundle": "cp -r src router && tsc typings/index.d.ts src/router.ts --rootDir . --module system -t es5 --outFile dist/bundles/router.js  --moduleResolution node --emitDecoratorMetadata --experimentalDecorators"
   },
   "keywords": [
     "angular2",
@@ -30,10 +30,10 @@
   },
   "homepage": "https://github.com/angular/vladivostok#readme",
   "dependencies": {
-    "@angular/core":  "2.0.0-rc.1",
-    "@angular/platform-browser": "2.0.0-rc.1",
     "@angular/common": "2.0.0-rc.1",
     "@angular/compiler": "2.0.0-rc.1",
+    "@angular/core": "2.0.0-rc.1",
+    "@angular/platform-browser": "2.0.0-rc.1",
     "@angular/platform-browser-dynamic": "2.0.0-rc.1",
     "rxjs": "5.0.0-beta.6"
   },
@@ -60,8 +60,8 @@
     "systemjs-builder": "^0.15.7",
     "traceur": "0.0.96",
     "tsd": "^0.6.5",
-    "typescript": "1.8.9",
-    "typings": "^0.6.2",
+    "typescript": "^1.9.0-dev.20160521-1.0",
+    "typings": "^1.0.4",
     "zone.js": "^0.6.6"
   },
   "typings": "dist/router.d.ts"
diff --git a/modules/@angular/router/tsconfig.json b/modules/@angular/router/tsconfig.json
index 096b7dd3ac..523357d10e 100644
--- a/modules/@angular/router/tsconfig.json
+++ b/modules/@angular/router/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "strictNullChecks": true,
     "module": "commonjs",
     "target": "es5",
     "noImplicitAny": false,
@@ -15,7 +16,8 @@
   "files": [
     "src/router.ts",
     "test/tree.spec.ts",
+    "test/url_serializer.spec.ts",
     "test/router.spec.ts",
-    "typings/main.d.ts"
+    "typings/index.d.ts"
   ]
 }
diff --git a/modules/@angular/router/tsconfig.publish.es5.json b/modules/@angular/router/tsconfig.publish.es5.json
index f37ef16b98..ad9b7eea36 100644
--- a/modules/@angular/router/tsconfig.publish.es5.json
+++ b/modules/@angular/router/tsconfig.publish.es5.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "strictNullChecks": true,
     "module": "commonjs",
     "target": "es5",
     "noImplicitAny": false,
@@ -14,6 +15,6 @@
   },
   "files": [
     "src/router.ts",
-    "typings/main.d.ts"
+    "typings/index.d.ts"
   ]
 }
diff --git a/modules/@angular/router/tsconfig.publish.es6.json b/modules/@angular/router/tsconfig.publish.es6.json
index 1f03068c17..f1ab75f1be 100644
--- a/modules/@angular/router/tsconfig.publish.es6.json
+++ b/modules/@angular/router/tsconfig.publish.es6.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "strictNullChecks": true,
     "target": "es6",
     "noImplicitAny": false,
     "outDir": "dist/es6",