diff --git a/.eslintrc b/.eslintrc
index a167df14d6..418fe63976 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -7,6 +7,10 @@
     "mocha": true,
     "node": true
   },
+  "parser": "babel-eslint",
+  "plugins": [
+    "react"
+  ],
   "globals": {
     "window": true,
     "$": true,
@@ -41,7 +45,7 @@
     "valid-jsdoc": 2,
     "valid-typeof": 2,
 
-    "block-scoped-var": 2,
+    "block-scoped-var": 0,
     "complexity": 0,
     "consistent-return": 2,
     "curly": 2,
@@ -215,6 +219,21 @@
     "max-params": 0,
     "max-statements": 0,
     "no-bitwise": 1,
-    "no-plusplus": 0
+    "no-plusplus": 0,
+
+    "react/display-name": 1,
+    "react/jsx-boolean-value": 1,
+    "react/jsx-quotes": [1, "single", "avoid-escape"],
+    "react/jsx-no-undef": 1,
+    "react/jsx-sort-props": 1,
+    "react/jsx-uses-react": 1,
+    "react/jsx-uses-vars": 1,
+    "react/no-did-mount-set-state": 2,
+    "react/no-did-update-set-state": 2,
+    "react/no-multi-comp": 2,
+    "react/prop-types": 2,
+    "react/react-in-jsx-scope": 1,
+    "react/self-closing-comp": 1,
+    "react/wrap-multilines": 1
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index a73ad3fc48..72dae9262c 100644
--- a/package.json
+++ b/package.json
@@ -11,13 +11,14 @@
   },
   "scripts": {
     "start": "node app.js",
+    "lint": "eslint --ext=.js,.jsx .",
     "test": "mocha"
   },
   "license": "BSD-3-Clause",
-  "contributors" : [
+  "contributors": [
     {
       "name": "Quincy Larson",
-      "url" : "https://github.com/QuincyLarson"
+      "url": "https://github.com/QuincyLarson"
     },
     {
       "name": "Nathan Leniz",
@@ -82,10 +83,13 @@
     "yui": "~3.18.1"
   },
   "devDependencies": {
+    "babel-eslint": "^3.1.7",
     "blessed": "~0.0.37",
     "bower-main-files": "~0.0.4",
     "browser-sync": "~1.8.1",
     "chai": "~1.10.0",
+    "eslint": "^0.21.2",
+    "eslint-plugin-react": "^2.3.0",
     "gulp": "~3.8.8",
     "gulp-eslint": "~0.9.0",
     "gulp-inject": "~1.0.2",