diff --git a/.eslintrc b/.eslintrc
index 8edd43e..7404c19 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,4 +1,5 @@
 {
+  "parser": "babel-eslint",
   "plugins": [
     "react"
   ],
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34ce50e..edc85f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 1.0.2:
 
+1. Added babel-eslint (as suggested in https://github.com/newtriks/generator-react-webpack/issues/173)
+
+## 1.0.2:
+
 1. Updated css-loader to current stable (0.23)
 2. Updated glob to new major (5.x to 6.x)
 
diff --git a/package.json b/package.json
index 995e79c..23a0e5b 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
   "homepage": "https://github.com/weblogixx/react-webpack-template#readme",
   "devDependencies": {
     "babel-core": "^6.0.0",
+    "babel-eslint": "^5.0.0-beta4",
     "babel-loader": "^6.0.0",
     "babel-preset-es2015": "^6.0.15",
     "babel-preset-react": "^6.0.15",