diff --git a/.eslintrc b/.eslintrc.json
similarity index 94%
rename from .eslintrc
rename to .eslintrc.json
index ef7382d1..858db8dd 100644
--- a/.eslintrc
+++ b/.eslintrc.json
@@ -1,14 +1,16 @@
 {
+    "parser": "espree",
+    "ecmaFeatures": {},
     "env": {
         "node": true
     },
-    "parser": "espree",
-    "ecmaFeatures": {},
     "rules": {
         "no-alert": 2,
         "no-array-constructor": 2,
+        "no-arrow-condition": 2,
         "no-bitwise": 0,
         "no-caller": 2,
+        "no-case-declarations": 2,
         "no-catch-shadow": 2,
         "no-class-assign": 2,
         "no-cond-assign": 2,
@@ -28,6 +30,7 @@
         "no-empty": 2,
         "no-empty-character-class": 2,
         "no-empty-label": 2,
+        "no-empty-pattern": 2,
         "no-eq-null": 2,
         "no-eval": 2,
         "no-ex-assign": 2,
@@ -39,9 +42,9 @@
         "no-fallthrough": 2,
         "no-floating-decimal": 2,
         "no-func-assign": 2,
-        "no-implicit-coercion": 0,
+        "no-implicit-coercion": [2, {"boolean": false, "number": true, "string": true}],
         "no-implied-eval": 2,
-        "no-inline-comments": 2,
+        "no-inline-comments": 0,
         "no-inner-declarations": [2, "functions"],
         "no-invalid-regexp": 2,
         "no-invalid-this": 0,
@@ -59,6 +62,7 @@
         "no-multi-str": 2,
         "no-multiple-empty-lines": [2, {"max": 2}],
         "no-native-reassign": 2,
+        "no-negated-condition": 0,
         "no-negated-in-lhs": 2,
         "no-nested-ternary": 0,
         "no-new": 2,
@@ -108,8 +112,10 @@
         "no-var": 0,
         "no-warning-comments": [2, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
         "no-with": 2,
+        "no-magic-numbers": 0,
 
         "array-bracket-spacing": [2, "always"],
+        "arrow-body-style": [2, "as-needed"],
         "arrow-parens": 2,
         "arrow-spacing": 2,
         "accessor-pairs": 2,
diff --git a/package.json b/package.json
index 0661f45e..cb1645e0 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "browserify": "^11.2.0",
     "cpy": "^3.4.1",
-    "eslint": "^1.5.1",
+    "eslint": "^1.10.3",
     "istanbul": "^0.3.21",
     "nodeunit": "^0.9.1",
     "q": "^1.4.0",