diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d414dd..0643adc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # react-webpack-template - Changelog
 
+## 1.5.1:
+
+1. Emergency fix for corruct eslint version (2.3 is currently buggy). Fixes https://github.com/newtriks/generator-react-webpack/issues/196
+2. Added mocha to eslint global config as requested in https://github.com/newtriks/generator-react-webpack/issues/195
+
 ## 1.5.0:
 
 1. Added babel polyfill to tests per default (provided by [Igonato](https://github.com/Igonato))
diff --git a/package.json b/package.json
index 46b13a4..c26effc 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "chai": "^3.2.0",
     "copyfiles": "^0.2.1",
     "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
+    "eslint": "~2.2.0",
     "eslint-loader": "^1.0.0",
     "eslint-plugin-react": "^4.0.0",
     "file-loader": "^0.8.4",