diff --git a/config/babel.dev.js b/config/babel.dev.js
index 39309b21243..e2a66b12233 100644
--- a/config/babel.dev.js
+++ b/config/babel.dev.js
@@ -10,8 +10,7 @@
 module.exports = {
   cacheDirectory: true,
   presets: [
-    'babel-preset-es2015',
-    'babel-preset-es2016',
+    'babel-preset-es2015-webpack',
     'babel-preset-react'
   ].map(require.resolve),
   plugins: [
diff --git a/config/babel.prod.js b/config/babel.prod.js
index 77a33cf475d..3ca092bd0e0 100644
--- a/config/babel.prod.js
+++ b/config/babel.prod.js
@@ -9,8 +9,7 @@
 
 module.exports = {
   presets: [
-    'babel-preset-es2015',
-    'babel-preset-es2016',
+    'babel-preset-es2015-webpack',
     'babel-preset-react'
   ].map(require.resolve),
   plugins: [
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 5503096179f..fa0b53b5e9f 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -48,7 +48,7 @@ module.exports = {
     extensions: ['', '.js'],
   },
   resolveLoader: {
-    root: nodeModulesPath,
+    modules: nodeModulesPath,
     moduleTemplates: ['*-loader']
   },
   module: {
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 89f50f764bb..e5826443881 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -49,7 +49,7 @@ module.exports = {
     extensions: ['', '.js'],
   },
   resolveLoader: {
-    root: nodeModulesPath,
+    modules: nodeModulesPath,
     moduleTemplates: ['*-loader']
   },
   module: {
@@ -73,7 +73,7 @@ module.exports = {
         // Disable autoprefixer in css-loader itself:
         // https://github.com/webpack/css-loader/issues/281
         // We already have it thanks to postcss.
-        loader: ExtractTextPlugin.extract('style', 'css?-autoprefixer!postcss')
+        loader: ExtractTextPlugin.extract({ fallbackLoader: 'style', loader: 'css?-autoprefixer!postcss' })
       },
       {
         test: /\.json$/,
@@ -120,6 +120,7 @@ module.exports = {
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.optimize.DedupePlugin(),
     new webpack.optimize.UglifyJsPlugin({
+      sourceMap: true,
       compressor: {
         screw_ie8: true,
         warnings: false
diff --git a/package.json b/package.json
index 321b19178ab..4acd156bc01 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "babel-plugin-transform-class-properties": "6.10.2",
     "babel-plugin-transform-object-rest-spread": "6.8.0",
     "babel-plugin-transform-react-constant-elements": "6.9.1",
-    "babel-preset-es2015": "6.9.0",
+    "babel-preset-es2015-webpack": "6.4.2",
     "babel-preset-es2016": "6.11.3",
     "babel-preset-react": "6.11.1",
     "chalk": "1.1.3",
@@ -46,7 +46,7 @@
     "eslint-plugin-import": "1.10.3",
     "eslint-plugin-jsx-a11y": "2.0.1",
     "eslint-plugin-react": "5.2.2",
-    "extract-text-webpack-plugin": "1.0.1",
+    "extract-text-webpack-plugin": "2.0.0-beta.3",
     "file-loader": "0.9.0",
     "fs-extra": "^0.30.0",
     "html-webpack-plugin": "2.22.0",
@@ -56,8 +56,8 @@
     "rimraf": "2.5.3",
     "style-loader": "0.13.1",
     "url-loader": "0.5.7",
-    "webpack": "1.13.1",
-    "webpack-dev-server": "1.14.1"
+    "webpack": "2.1.0-beta.20",
+    "webpack-dev-server": "2.1.0-beta.0"
   },
   "devDependencies": {
     "bundle-deps": "^1.0.0",