diff --git a/.eslintrc b/.eslintrc
index 7404c19..13eea8c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,9 +3,12 @@
   "plugins": [
     "react"
   ],
-  "ecmaFeatures": {
-    "jsx": true,
-    "modules": true
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
   },
   "env": {
     "browser": true,
@@ -25,6 +28,7 @@
     "no-trailing-spaces": [1, { "skipBlankLines": true }],
     "no-unreachable": 1,
     "no-alert": 0,
-    "react/jsx-uses-react": 1
+    "react/jsx-uses-react": 1,
+    "react/jsx-uses-vars": 1
   }
 }
diff --git a/package.json b/package.json
index e09aa55..8fb9294 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   "homepage": "https://github.com/weblogixx/react-webpack-template#readme",
   "devDependencies": {
     "babel-core": "^6.0.0",
-    "babel-eslint": "^5.0.0-beta4",
+    "babel-eslint": "^5.0.0",
     "babel-loader": "^6.0.0",
     "babel-polyfill": "^6.3.14",
     "babel-preset-es2015": "^6.0.15",
@@ -46,7 +46,7 @@
     "chai": "^3.2.0",
     "copyfiles": "^0.2.1",
     "css-loader": "^0.23.0",
-    "eslint": "^1.2.1",
+    "eslint": "^2.0.0",
     "eslint-loader": "^1.0.0",
     "eslint-plugin-react": "^3.3.0",
     "file-loader": "^0.8.4",