diff --git a/templates/common/_package.json b/templates/common/_package.json
index 75830a7..4709ba7 100644
--- a/templates/common/_package.json
+++ b/templates/common/_package.json
@@ -34,6 +34,7 @@
     "webpack-dev-server": "~1.6.5",
     "grunt-open": "~0.2.3",
     "jshint-loader": "~0.8.0",
+    "jsxhint-loader": "~0.2.0",
     "grunt-contrib-copy": "~0.5.0",<% if (es6) { %>
     "babel": "^4.0.0",
     "babel-loader": "^4.0.0",<% } %>
diff --git a/templates/common/_webpack.config.js b/templates/common/_webpack.config.js
index b23c0b0..7f19c55 100644
--- a/templates/common/_webpack.config.js
+++ b/templates/common/_webpack.config.js
@@ -34,7 +34,7 @@ module.exports = {
     preLoaders: [{
       test: /\.js$/,
       exclude: /node_modules/,
-      loader: 'jshint'
+      loader: 'jsxhint'
     }],
     loaders: [{
       test: /\.js$/,
diff --git a/templates/common/_webpack.dist.config.js b/templates/common/_webpack.dist.config.js
index 2e89773..c205b2d 100644
--- a/templates/common/_webpack.dist.config.js
+++ b/templates/common/_webpack.dist.config.js
@@ -40,7 +40,7 @@ module.exports = {
     preLoaders: [{
       test: /\.js$/,
       exclude: /node_modules/,
-      loader: 'jshint'
+      loader: 'jsxhint'
     }],
 
     loaders: [{