diff --git a/.babelrc b/.babelrc
index a976990ee9..3ba0e83fa1 100644
--- a/.babelrc
+++ b/.babelrc
@@ -2,8 +2,9 @@
   "presets": ["react"],
   "ignore": ["third_party"],
   "plugins": [
+    "transform-class-properties",
     "syntax-trailing-function-commas",
-    "babel-plugin-transform-object-rest-spread",
+    "transform-object-rest-spread",
     "transform-es2015-template-literals",
     "transform-es2015-literals",
     "transform-es2015-arrow-functions",
diff --git a/package.json b/package.json
index 19c0e5b76b..74f4e04a21 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "babel-eslint": "^5.0.0",
     "babel-plugin-check-es2015-constants": "^6.5.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.5.0",
+    "babel-plugin-transform-class-properties": "^6.10.2",
     "babel-plugin-transform-es2015-arrow-functions": "^6.5.2",
     "babel-plugin-transform-es2015-block-scoped-functions": "^6.5.0",
     "babel-plugin-transform-es2015-block-scoping": "^6.5.0",