diff --git a/.eslintrc b/.eslintrc
index 43a2a517d..da85c8816 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,13 +1,20 @@
 {
   "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
   "env": {
     "browser": true,
-    "node": true
+    "node": true,
+    "es6": true
   },
   "globals": {
     "__DEV__": true,
     "__SERVER__": true
   },
+  "ecmaFeatures": {
+    "jsx": true
+  },
   "rules": {
     // Strict mode
     "strict": [2, "never"],
diff --git a/package.json b/package.json
index 17e10f6db..7e95ac090 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "del": "^1.1.1",
     "eslint": "^0.19.0",
     "eslint-loader": "^0.10.0",
+    "eslint-plugin-react": "^2.1.0",
     "git-push": "^0.1.0",
     "gulp": "^3.8.11",
     "gulp-autoprefixer": "^2.1.0",
diff --git a/src/components/App/setViewport.js b/src/components/App/setViewport.js
index b2895feb7..67f025561 100644
--- a/src/components/App/setViewport.js
+++ b/src/components/App/setViewport.js
@@ -6,10 +6,10 @@
  * LICENSE.txt file in the root directory of this source tree.
  */
 
-import React, { Component } from 'react';
+import React, { Component } from 'react'; // eslint-disable-line no-unused-vars
 import { canUseDOM } from 'react/lib/ExecutionEnvironment';
 
-export default function setViewport(ComposedComponent) {
+function setViewport(ComposedComponent) {
   return class AppViewport extends Component {
 
     constructor() {
@@ -45,4 +45,6 @@ export default function setViewport(ComposedComponent) {
     }
 
   };
-};
+}
+
+export default setViewport;
diff --git a/src/components/ContentPage/ContentPage.js b/src/components/ContentPage/ContentPage.js
index 2e87e4bc6..86ab94d3d 100644
--- a/src/components/ContentPage/ContentPage.js
+++ b/src/components/ContentPage/ContentPage.js
@@ -7,7 +7,7 @@
  */
 
 import './ContentPage.less';
-import React, { PropTypes } from 'react';
+import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
 
 class ContentPage {
 
diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.js
index c8bba43d2..4ac92b4c6 100644
--- a/src/components/Navbar/Navbar.js
+++ b/src/components/Navbar/Navbar.js
@@ -6,9 +6,9 @@
  * LICENSE.txt file in the root directory of this source tree.
  */
 
-import React, { Component } from 'react';
+import React from 'react'; // eslint-disable-line no-unused-vars
 
-class Navbar extends Component {
+class Navbar {
 
   render() {
     return (
diff --git a/src/components/NotFoundPage/NotFoundPage.js b/src/components/NotFoundPage/NotFoundPage.js
index 2b0a22df5..38cbc934d 100644
--- a/src/components/NotFoundPage/NotFoundPage.js
+++ b/src/components/NotFoundPage/NotFoundPage.js
@@ -7,9 +7,9 @@
  */
 
 //import './NotFoundPage.less';
-import React, { Component } from 'react';
+import React from 'react'; // eslint-disable-line no-unused-vars
 
-class NotFoundPage extends Component {
+class NotFoundPage {
 
   render() {
     return (