diff --git a/.eslintrc b/.eslintrc
index 0a596efac..afcd1f46a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -43,8 +43,8 @@
     "new-parens": "error",
     "no-array-constructor": "error",
     "no-class-assign": "error",
-    "no-const-assign": "error",
     "no-console": "error",
+    "no-const-assign": "error",
     "no-debugger": "error",
     "no-dupe-args": "error",
     "no-dupe-class-members": "error",
@@ -76,7 +76,7 @@
     "no-unreachable": "error",
     "no-unsafe-finally": "error",
     "no-unused-expressions": "error",
-    "no-unused-vars": "warn",
+    "no-unused-vars": ["warn", { "vars": "all", "args": "none" }],
     "no-useless-call": "error",
     "no-useless-computed-key": "error",
     "no-useless-constructor": "error",
@@ -102,6 +102,9 @@
     "react/jsx-no-duplicate-props": "error",
     "react/jsx-no-undef": "error",
     "react/jsx-space-before-closing": ["error", "always"],
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "react/jsx-wrap-multilines": "error",
     "react/no-deprecated": "error",
     "react/no-did-mount-set-state": "error",
     "react/no-did-update-set-state": "error",
@@ -110,7 +113,6 @@
     "react/react-in-jsx-scope": "error",
     "react/self-closing-comp": "error",
     "react/sort-prop-types": "error",
-    "react/wrap-multilines": "error",
     "rest-spread-spacing": ["error", "never"],
     "semi": ["error", "never"],
     "space-before-blocks": "error",
diff --git a/package.json b/package.json
index 1938cdedd..9a9815bff 100644
--- a/package.json
+++ b/package.json
@@ -39,9 +39,9 @@
     "disc": "^1.3.2",
     "envify": "^3.4.1",
     "enzyme": "^2.4.1",
-    "eslint": "^3.0.1",
-    "eslint-plugin-import": "^1.10.2",
-    "eslint-plugin-react": "^5.2.2",
+    "eslint": "^3.8.1",
+    "eslint-plugin-import": "^2.0.1",
+    "eslint-plugin-react": "^6.4.1",
     "fbjs": "^0.8.3",
     "gh-pages": "^0.11.0",
     "http-server": "^0.9.0",