diff --git a/client/.babelrc b/client/.babelrc
new file mode 100644
index 000000000..86c445f54
--- /dev/null
+++ b/client/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015", "react"]
+}
diff --git a/client/Dockerfile b/client/Dockerfile
index 5f80b3d02..155089bba 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -3,4 +3,4 @@ WORKDIR /home/weave
 COPY package.json /home/weave/
 # Dont install optional developer tools
 RUN npm install --no-optional
-COPY webpack.local.config.js webpack.production.config.js server.js .eslintrc .eslintignore /home/weave/
+COPY webpack.local.config.js webpack.production.config.js server.js .babelrc .eslintrc .eslintignore /home/weave/
diff --git a/client/app/scripts/charts/nodes-layout.js b/client/app/scripts/charts/nodes-layout.js
index 21e74ebd8..a954c3bcf 100644
--- a/client/app/scripts/charts/nodes-layout.js
+++ b/client/app/scripts/charts/nodes-layout.js
@@ -1,6 +1,3 @@
-// polyfill
-Object.assign = require('object-assign');
-
 const dagre = require('dagre');
 const debug = require('debug')('scope:nodes-layout');
 const makeMap = require('immutable').Map;
diff --git a/client/package.json b/client/package.json
index f19608797..2397a68be 100644
--- a/client/package.json
+++ b/client/package.json
@@ -28,12 +28,14 @@
     "timely": "0.1.0"
   },
   "devDependencies": {
-    "autoprefixer-core": "5.2.0",
-    "babel-core": "5.8.33",
+    "autoprefixer": "6.0.1",
+    "babel-core": "6.1.4",
     "babel-eslint": "4.1.5",
-    "babel-jest": "5.3.0",
-    "babel-loader": "5.1.3",
-    "css-loader": "0.17.0",
+    "babel-jest": "6.0.1",
+    "babel-loader": "6.1.0",
+    "babel-preset-es2015": "6.1.4",
+    "babel-preset-react": "6.1.4",
+    "css-loader": "0.22.0",
     "eslint": "1.9.0",
     "eslint-config-airbnb": "1.0.0",
     "eslint-loader": "1.1.1",
@@ -44,7 +46,7 @@
     "json-loader": "0.5.3",
     "less": "~2.5.1",
     "less-loader": "2.2.1",
-    "postcss-loader": "0.4.3",
+    "postcss-loader": "0.7.0",
     "style-loader": "0.13.0",
     "url": "0.11.0",
     "url-loader": "0.5.6",
@@ -69,7 +71,6 @@
   "jest": {
     "scriptPreprocessor": "<rootDir>/node_modules/babel-jest",
     "testFileExtensions": [
-      "es6",
       "js"
     ],
     "testPathDirs": [
@@ -80,14 +81,13 @@
     },
     "moduleFileExtensions": [
       "js",
-      "json",
-      "es6"
+      "json"
     ],
     "unmockedModulePathPatterns": [
       "/node_modules/"
     ]
   },
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4.2.2"
   }
 }
diff --git a/client/webpack.local.config.js b/client/webpack.local.config.js
index 3c3402aa4..ae14b65a9 100644
--- a/client/webpack.local.config.js
+++ b/client/webpack.local.config.js
@@ -1,5 +1,5 @@
 var webpack = require('webpack');
-var autoprefixer = require('autoprefixer-core');
+var autoprefixer = require('autoprefixer');
 var path = require('path');
 
 /**
@@ -75,7 +75,7 @@ module.exports = {
       {
         test: /\.jsx?$/,
         exclude: /node_modules/,
-        loaders: ['react-hot', 'babel-loader?stage=0']
+        loaders: ['react-hot', 'babel']
       }
     ]
   },
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index 3e2535ee1..0bac9088e 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -1,5 +1,5 @@
 var webpack = require('webpack');
-var autoprefixer = require('autoprefixer-core');
+var autoprefixer = require('autoprefixer');
 var path = require('path');
 
 var GLOBALS = {
@@ -42,7 +42,7 @@ module.exports = {
         test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         loader: 'file-loader'
       },
-      { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?stage=0' }
+      { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel' }
     ]
   },