diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8eea58c067e..19f28a72021d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+<a name="1.0.0-beta.21"></a>
+# [1.0.0-beta.21](https://github.com/angular/angular-cli/compare/v1.0.0-beta.20-1...v1.0.0-beta.21) (2016-11-23)
+
+
+### Bug Fixes
+
+* **angular-cli:** add necessary dependencies. ([#3152](https://github.com/angular/angular-cli/issues/3152)) ([8f574e4](https://github.com/angular/angular-cli/commit/8f574e4)), closes [#3148](https://github.com/angular/angular-cli/issues/3148)
+* **angular-cli:** add necessary dependency. ([f7704b0](https://github.com/angular/angular-cli/commit/f7704b0))
+* **angular-cli:** change version of webpack plugin. ([07e96ea](https://github.com/angular/angular-cli/commit/07e96ea))
+* **aot:** lock the angular version to 2.2.1. ([#3242](https://github.com/angular/angular-cli/issues/3242)) ([6e8a848](https://github.com/angular/angular-cli/commit/6e8a848))
+* **editorconfig:** use off instead of 0 for max line length ([#3186](https://github.com/angular/angular-cli/issues/3186)) ([f833d25](https://github.com/angular/angular-cli/commit/f833d25))
+* **generate:** revert change to component dir in generate module, as it caused component declaration to go to parent module ([#3158](https://github.com/angular/angular-cli/issues/3158)) ([71bf855](https://github.com/angular/angular-cli/commit/71bf855))
+* **github-pages-deploy:** Show more accurate url ([#3160](https://github.com/angular/angular-cli/issues/3160)) ([a431389](https://github.com/angular/angular-cli/commit/a431389))
+
+
+### Features
+
+* **build:** add sourcemap option ([#3113](https://github.com/angular/angular-cli/issues/3113)) ([6f9d2c1](https://github.com/angular/angular-cli/commit/6f9d2c1))
+
+
+
 <a name="1.0.0-beta.20"></a>
 # [1.0.0-beta.20](https://github.com/angular/angular-cli/compare/v1.0.0-beta.19...v1.0.0-beta.20-1) (2016-11-16)
 
diff --git a/package.json b/package.json
index 82fbace4747a..917dbb35b21d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "1.0.0-beta.20-1",
+  "version": "1.0.0-beta.21",
   "description": "CLI tool for Angular",
   "main": "packages/angular-cli/lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -41,10 +41,10 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@angular-cli/ast-tools": "^1.0.0",
-    "@angular/compiler": "^2.1.0",
-    "@angular/compiler-cli": "^2.1.0",
-    "@angular/core": "^2.1.0",
-    "@angular/tsc-wrapped": "^0.3.0",
+    "@angular/compiler": "2.2.1",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
+    "@angular/tsc-wrapped": "0.4.0",
     "angular2-template-loader": "^0.5.0",
     "autoprefixer": "^6.5.3",
     "awesome-typescript-loader": "^2.2.3",
diff --git a/packages/angular-cli/blueprints/ng2/files/.editorconfig b/packages/angular-cli/blueprints/ng2/files/.editorconfig
index 06dde115f57e..6e87a003da89 100644
--- a/packages/angular-cli/blueprints/ng2/files/.editorconfig
+++ b/packages/angular-cli/blueprints/ng2/files/.editorconfig
@@ -9,5 +9,5 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
-max_line_length = 0
+max_line_length = off
 trim_trailing_whitespace = false
diff --git a/packages/angular-cli/blueprints/ng2/files/package.json b/packages/angular-cli/blueprints/ng2/files/package.json
index c3e7995715a3..464ed3361e0a 100644
--- a/packages/angular-cli/blueprints/ng2/files/package.json
+++ b/packages/angular-cli/blueprints/ng2/files/package.json
@@ -12,33 +12,33 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^2.1.0",
-    "@angular/compiler": "^2.1.0",
-    "@angular/core": "^2.1.0",
-    "@angular/forms": "^2.1.0",
-    "@angular/http": "^2.1.0",
-    "@angular/platform-browser": "^2.1.0",
-    "@angular/platform-browser-dynamic": "^2.1.0",
-    "@angular/router": "^3.1.0",
+    "@angular/common": "2.2.1",
+    "@angular/compiler": "2.2.1",
+    "@angular/core": "2.2.1",
+    "@angular/forms": "2.2.1",
+    "@angular/http": "2.2.1",
+    "@angular/platform-browser": "2.2.1",
+    "@angular/platform-browser-dynamic": "2.2.1",
+    "@angular/router": "3.2.1",
     "core-js": "^2.4.1",
     "rxjs": "5.0.0-beta.12",
     "ts-helpers": "^1.1.1",
     "zone.js": "^0.6.23"
   },
   "devDependencies": {<% if(isMobile) { %>
-    "@angular/platform-server": "~2.1.0",
+    "@angular/platform-server": "2.2.1",
     "@angular/service-worker": "0.2.0",
     "@angular/app-shell": "0.0.0",
     "angular2-universal":"0.104.5",
     "angular2-universal-polyfills": "0.4.1",
     "preboot": "2.1.2",
     "parse5": "1.5.1",<% } %>
-    "@angular/compiler-cli": "^2.1.0",
-    "@types/jasmine": "^2.2.30",
+    "@angular/compiler-cli": "2.2.1",
+    "@types/jasmine": "2.5.38",
     "@types/node": "^6.0.42",
     "angular-cli": "<%= version %>",
     "codelyzer": "~1.0.0-beta.3",
-    "jasmine-core": "2.4.1",
+    "jasmine-core": "2.5.2",
     "jasmine-spec-reporter": "2.5.0",
     "karma": "1.2.0",
     "karma-chrome-launcher": "^2.0.0",
diff --git a/packages/angular-cli/models/webpack-build-common.ts b/packages/angular-cli/models/webpack-build-common.ts
index fb1ba9a5ccc1..51c95346e44c 100644
--- a/packages/angular-cli/models/webpack-build-common.ts
+++ b/packages/angular-cli/models/webpack-build-common.ts
@@ -84,7 +84,7 @@ export function getWebpackCommonConfig(
         { test: /\.(jpg|png|gif)$/, loader: 'url-loader?limit=10000' },
         { test: /\.html$/, loader: 'raw-loader' },
 
-        { test: /\.(otf|ttf|woff|woff2)$/, loader: 'url?limit=10000' },
+        { test: /\.(otf|ttf|woff|woff2)$/, loader: 'url-loader?limit=10000' },
         { test: /\.(eot|svg)$/, loader: 'file-loader' }
       ]
     },
diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json
index abf9d7a0ceeb..b31db9bbde02 100644
--- a/packages/angular-cli/package.json
+++ b/packages/angular-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "1.0.0-beta.20-1",
+  "version": "1.0.0-beta.21",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -27,9 +27,9 @@
   "dependencies": {
     "@angular-cli/ast-tools": "^1.0.1",
     "@angular-cli/base-href-webpack": "^1.0.0",
-    "@angular/compiler": "^2.1.0",
-    "@angular/compiler-cli": "^2.1.0",
-    "@angular/core": "^2.1.0",
+    "@angular/compiler": "2.2.1",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
     "@ngtools/webpack": "^1.0.0",
     "angular2-template-loader": "^0.5.0",
     "awesome-typescript-loader": "^2.2.3",
diff --git a/packages/ast-tools/package.json b/packages/ast-tools/package.json
index 962c5df2fc57..8421023eaaed 100644
--- a/packages/ast-tools/package.json
+++ b/packages/ast-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-cli/ast-tools",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "CLI tool for Angular",
   "main": "./src/index.js",
   "keywords": [
diff --git a/packages/base-href-webpack/package.json b/packages/base-href-webpack/package.json
index aa13615244cf..1a3c29a6a901 100644
--- a/packages/base-href-webpack/package.json
+++ b/packages/base-href-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-cli/base-href-webpack",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Base HREF Webpack plugin",
   "main": "./src/index.js",
   "keywords": [
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 8f5b6be28264..e8221626e700 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -29,8 +29,8 @@
   },
   "peerDependencies": {
     "typescript": "^2.0.2",
-    "@angular/compiler-cli": "^2.1.0",
-    "@angular/core": "^2.1.0",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
     "reflect-metadata": "^0.1.8"
   }
 }
diff --git a/tests/e2e/assets/webpack/test-app/package.json b/tests/e2e/assets/webpack/test-app/package.json
index 3c53508c260d..3820b8170840 100644
--- a/tests/e2e/assets/webpack/test-app/package.json
+++ b/tests/e2e/assets/webpack/test-app/package.json
@@ -2,15 +2,15 @@
   "name": "test",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "~2.1.0",
-    "@angular/compiler": "~2.1.0",
-    "@angular/compiler-cli": "~2.1.0",
-    "@angular/core": "~2.1.0",
-    "@angular/http": "~2.1.0",
-    "@angular/platform-browser": "~2.1.0",
-    "@angular/platform-browser-dynamic": "~2.1.0",
-    "@angular/platform-server": "~2.1.0",
-    "@angular/router": "~3.1.0",
+    "@angular/common": "2.2.1",
+    "@angular/compiler": "2.2.1",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
+    "@angular/http": "2.2.1",
+    "@angular/platform-browser": "2.2.1",
+    "@angular/platform-browser-dynamic": "2.2.1",
+    "@angular/platform-server": "2.2.1",
+    "@angular/router": "3.2.1",
     "core-js": "^2.4.1",
     "rxjs": "^5.0.0-beta.12",
     "zone.js": "^0.6.21"