diff --git a/config/babel.dev.js b/config/babel.dev.js
index ff00b2fa05e54d178f576e3712c1506a7be1bc25..39309b2124391d2b7e310efa337a4df3974ebb09 100644
--- a/config/babel.dev.js
+++ b/config/babel.dev.js
@@ -15,6 +15,8 @@ module.exports = {
     'babel-preset-react'
   ].map(require.resolve),
   plugins: [
+    'babel-plugin-syntax-trailing-function-commas',
+    'babel-plugin-transform-class-properties',
     'babel-plugin-transform-object-rest-spread'
   ].map(require.resolve)
 };
diff --git a/config/babel.prod.js b/config/babel.prod.js
index 64979ed762ec60b81ce072d6ec8cf852e7b14053..77a33cf475d1f20a44fc3d091a3222a7c5621933 100644
--- a/config/babel.prod.js
+++ b/config/babel.prod.js
@@ -14,6 +14,8 @@ module.exports = {
     'babel-preset-react'
   ].map(require.resolve),
   plugins: [
+    'babel-plugin-syntax-trailing-function-commas',
+    'babel-plugin-transform-class-properties',
     'babel-plugin-transform-object-rest-spread',
     'babel-plugin-transform-react-constant-elements'
   ].map(require.resolve)
diff --git a/config/eslint.js b/config/eslint.js
index 58264714f6dd772ced2c62e48ecce88b35979f61..941aba4ac2462b14e4b14e75f24c183d00d681cf 100644
--- a/config/eslint.js
+++ b/config/eslint.js
@@ -16,6 +16,8 @@ var ERROR = 2; // rules that prevent common mistakes
 module.exports = {
   root: true,
 
+  parser: 'babel-eslint',
+
   plugins: ['react', 'import'],
 
   env: {
diff --git a/package.json b/package.json
index 787e6e087096833bc74cd0a6f070a5a19c4506a1..9b55e6b3202e73643af9e4ba7f667b7ffa672847 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,10 @@
   "dependencies": {
     "autoprefixer": "^6.3.7",
     "babel-core": "^6.10.4",
+    "babel-eslint": "^6.1.2",
     "babel-loader": "^6.2.4",
+    "babel-plugin-syntax-trailing-function-commas": "^6.8.0",
+    "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",
@@ -59,7 +62,10 @@
   "bundledDependencies": [
     "autoprefixer",
     "babel-core",
+    "babel-eslint",
     "babel-loader",
+    "babel-plugin-syntax-trailing-function-commas",
+    "babel-plugin-transform-class-properties",
     "babel-plugin-transform-object-rest-spread",
     "babel-plugin-transform-react-constant-elements",
     "babel-preset-es2015",