diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..1a5a548
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "transform-decorators-legacy"
+  ],
+  "presets": ["es2015", "stage-0", "react"]
+}
diff --git a/package.json b/package.json
index 08d585a..b5c264d 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,14 @@
   },
   "devDependencies": {
     "argparse": "^1.0.6",
-    "babel-core": "^5.8.25",
+    "babel-cli": "^6.16.0",
+    "babel-core": "^6.17.0",
     "babel-eslint": "^6.0.4",
-    "babel-loader": "^5.3.2",
-    "babel-runtime": "^5.5.7",
+    "babel-loader": "^6.2.5",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-preset-es2015": "^6.16.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-0": "^6.16.0",
     "compression-webpack-plugin": "^0.2.0",
     "copy-loader": "^0.1.3",
     "crx": "^3.0.3",
diff --git a/webpack/webpack.base.babel.js b/webpack/webpack.base.babel.js
index 92a513e..eb0ccff 100644
--- a/webpack/webpack.base.babel.js
+++ b/webpack/webpack.base.babel.js
@@ -38,7 +38,7 @@ module.exports = {
     loaders: [
       {
         test: /\.jsx?$/, // test for both js and jsx
-        loaders: ['babel?stage=0&loose'],
+        loader: 'babel',
         exclude: [paths.ASSETS],
         include: [paths.SRC, paths.TEST, /buildo-react-components/]
       },