diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts
index d4291f118851..17492be09c17 100644
--- a/addon/ng2/models/webpack-build-common.ts
+++ b/addon/ng2/models/webpack-build-common.ts
@@ -37,6 +37,7 @@ export function getWebpackCommonConfig(
     devtool: 'source-map',
     resolve: {
       extensions: ['', '.ts', '.js'],
+      mainFields: ['browser', 'main'],
       root: appRoot
     },
     context: path.resolve(__dirname, './'),
diff --git a/package.json b/package.json
index 94a2fdc0f5c6..931a13d53e4f 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "typedoc": "^0.4.2",
     "typescript": "2.0.0",
     "url-loader": "^0.5.7",
-    "webpack": "2.1.0-beta.19",
+    "webpack": "2.1.0-beta.21",
     "webpack-dev-server": "2.1.0-beta.0",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0"