diff --git a/.eslintrc b/.eslintrc
index 600475711..c4bfaacf5 100755
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,19 +1,18 @@
 {
   "extends": "eslint-config-rackt",
+  "parser": "babel-eslint",
   "env": {
     "browser": true,
     "mocha": true,
     "node": true
   },
   "rules": {
-    "react/jsx-uses-react": 1,
+    "react/jsx-uses-react": 2,
+    "react/jsx-uses-vars": 2,
     "react/jsx-no-undef": 2,
     "react/wrap-multilines": 2
   },
   "plugins": [
     "react"
-  ],
-  "globals": {
-    "REDUX_FORM_VERSION": true
-  }
+  ]
 }
diff --git a/package.json b/package.json
index 40c0dd544..c8eb9a07b 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
   "homepage": "https://redux-form.com/",
   "dependencies": {
     "deep-equal": "^1.0.1",
-    "es6-error": "^2.1.0",
+    "es6-error": "^3.0.0",
     "hoist-non-react-statics": "^1.0.5",
     "invariant": "^2.2.1",
     "is-promise": "^2.1.0",
@@ -52,7 +52,7 @@
   "devDependencies": {
     "babel-cli": "^6.3.17",
     "babel-core": "^6.3.26",
-    "babel-eslint": "^5.0.0-beta9",
+    "babel-eslint": "^6.0.4",
     "babel-loader": "^6.2.0",
     "babel-plugin-lodash": "^3.1.2",
     "babel-plugin-syntax-async-functions": "^6.5.0",
@@ -65,9 +65,9 @@
     "babel-preset-stage-2": "^6.1.18",
     "babel-register": "^6.3.13",
     "cross-env": "^1.0.7",
-    "eslint": "^1.7.1",
+    "eslint": "^2.11.1",
     "eslint-config-rackt": "^1.1.1",
-    "eslint-plugin-react": "^3.6.3",
+    "eslint-plugin-react": "^5.1.1",
     "expect": "^1.14.0",
     "expect-element": "^1.1.1",
     "expect-immutable": "0.0.3",
@@ -75,7 +75,7 @@
     "flux-standard-action": "^0.6.1",
     "isparta": "4.0.0",
     "jsdom": "^9.1.0",
-    "lodash-webpack-plugin": "^0.7.0",
+    "lodash-webpack-plugin": "^0.9.0",
     "mocha": "^2.4.5",
     "react": "^15.0.0",
     "react-addons-test-utils": "^15.0.0",
diff --git a/src/reduxForm.js b/src/reduxForm.js
index 281b80801..5886766d3 100755
--- a/src/reduxForm.js
+++ b/src/reduxForm.js
@@ -61,7 +61,7 @@ const propsToNotUpdateFor = [
 
 const checkSubmit = submit => {
   if (!submit || typeof submit !== 'function') {
-    throw new Error(`You must either pass handleSubmit() an onSubmit function or pass onSubmit as a prop`)
+    throw new Error('You must either pass handleSubmit() an onSubmit function or pass onSubmit as a prop')
   }
   return submit
 }
@@ -255,6 +255,7 @@ const createReduxForm =
 
           render() {
             // remove some redux-form config-only props
+            /* eslint-disable no-unused-vars */
             const {
               arrayInsert,
               arrayPop,
@@ -275,7 +276,8 @@ const createReduxForm =
               registerField,
               unregisterField,
               ...passableProps
-            } = this.props // eslint-disable-line no-redeclare
+            } = this.props
+            /* eslint-enable no-unused-vars */
             if (isClassComponent(WrappedComponent)) {
               passableProps.ref = 'wrapped'
             }