diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000000..761fd2af2b
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,104 @@
+{
+  "parser": "babel-eslint",
+  "plugins": [
+    "react",
+    "flowtype"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true,
+      "impliedStrict": true
+    }
+  },
+  "env": {
+    "browser": true,
+    "amd": true,
+    "es6": true,
+    "node": true,
+    "mocha": true
+  },
+  "extends": ["eslint:recommended", "plugin:react/recommended"],
+  "rules": {
+    "no-undef": ["warn"],
+    "global-strict": ["off"],
+    "no-extra-semi": ["warn"],
+    "no-underscore-dangle": ["off"],
+    "no-console": ["off"],
+    "no-unused-vars": ["off"],
+    "no-trailing-spaces": ["warn", {
+      "skipBlankLines": true
+    }],
+    "no-unreachable": ["warn"],
+    "no-spaced-func": ["warn"],
+    "no-new-func": ["error"],
+    "no-new-wrappers": ["error"],
+    "no-invalid-regexp": ["error"],
+    "no-extra-bind": ["error"],
+    "no-magic-numbers": ["error"],
+    "consistent-return": ["error"],
+    "valid-jsdoc": ["error"],
+    "no-use-before-define": ["error"],
+    "camelcase": ["warn"],
+    "array-callback-return": ["error"],
+    "dot-location": ["warn", "property"],
+    "guard-for-in": ["error"],
+    "no-useless-call": ["warn"],
+    "no-useless-escape": ["warn"],
+    "no-useless-concat": ["warn"],
+    "brace-style": ["warn", "1tbs"],
+    "comma-style": ["warn", "last"],
+    "space-before-function-paren": ["warn", "never"],
+    "space-before-blocks": ["warn", "always"],
+    "keyword-spacing": ["warn", {
+      "before": true,
+      "after": true
+    }],
+
+    // dangling commas required, but only for multiline objects/arrays
+    "comma-dangle": ["warn", "always-multiline"],
+    // always === instead of ==, unless dealing with null/undefined
+    "eqeqeq": ["error", "smart"],
+    // always use curly braces, even with single statements
+    "curly": ["error", "all"],
+    // phasing out var in favour of let/const is a good idea
+    "no-var": ["warn"],
+    // always require semicolons
+    "semi": ["error", "always"],
+    // prefer rest and spread over the Old Ways
+    "prefer-spread": ["warn"],
+    "prefer-rest-params": ["warn"],
+
+    /** react **/
+
+    // bind or arrow function in props causes performance issues
+    "react/jsx-no-bind": ["error"],
+    "react/jsx-key": ["error"],
+    "react/prefer-stateless-function": ["warn"],
+    "react/sort-comp": ["warn"],
+
+    /** flowtype **/
+    "flowtype/require-parameter-type": 1,
+    "flowtype/require-return-type": [
+      1,
+      "always",
+      {
+        "annotateUndefined": "never"
+      }
+    ],
+    "flowtype/space-after-type-colon": [
+      1,
+      "always"
+    ],
+    "flowtype/space-before-type-colon": [
+      1,
+      "never"
+    ]
+  },
+  "settings": {
+    "flowtype": {
+      "onlyFilesWithFlowAnnotation": true
+    }
+  }
+}
diff --git a/.gitignore b/.gitignore
index 8fdaf5903f..5139d614ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+npm-debug.log
+
 /node_modules
 /lib
 
diff --git a/package.json b/package.json
index e8c7dd4f97..be5556013b 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,8 @@
     "reskindex": "reskindex -h header",
     "build": "babel src -d lib --source-maps",
     "start": "babel src -w -d lib --source-maps",
+    "lint": "eslint",
+    "lintall": "eslint src/ test/",
     "clean": "rimraf lib",
     "prepublish": "npm run build && git rev-parse HEAD > git-revision.txt",
     "test": "karma start $KARMAFLAGS --browsers PhantomJS",
@@ -51,8 +53,12 @@
   "devDependencies": {
     "babel": "^5.8.23",
     "babel-core": "^5.8.38",
+    "babel-eslint": "^6.1.0",
     "babel-loader": "^5.4.0",
     "babel-polyfill": "^6.5.0",
+    "eslint": "^2.13.1",
+    "eslint-plugin-flowtype": "^2.3.0",
+    "eslint-plugin-react": "^5.2.2",
     "expect": "^1.16.0",
     "json-loader": "^0.5.3",
     "karma": "^0.13.22",