diff --git a/.eslintrc b/.eslintrc
index 54f7c611..753ca56d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -56,6 +56,7 @@
         "no-loop-func": 2,
         "no-mixed-requires": [2, true],
         "no-mixed-spaces-and-tabs": [2, false],
+        "linebreak-style": [0, "unix"],
         "no-multi-spaces": 2,
         "no-multi-str": 2,
         "no-multiple-empty-lines": [2, {"max": 2}],
@@ -97,6 +98,7 @@
         "no-undef-init": 2,
         "no-undefined": 0,
         "no-underscore-dangle": 2,
+        "no-unneeded-ternary": 2,
         "no-unreachable": 2,
         "no-unused-expressions": 2,
         "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
@@ -118,6 +120,7 @@
         "consistent-this": [2, "self"],
         "curly": [2, "all"],
         "default-case": 2,
+        "dot-location": [2, "property"],
         "dot-notation": [2, { "allowKeywords": true }],
         "eol-last": 2,
         "eqeqeq": 2,
diff --git a/package.json b/package.json
index f3167f20..f006c023 100644
--- a/package.json
+++ b/package.json
@@ -24,10 +24,10 @@
   },
   "devDependencies": {
     "browserify": "^10.1.3",
-    "eslint": "^0.20.0",
+    "eslint": "^0.21.0",
     "istanbul": "^0.3.13",
     "nodeunit": "^0.9.1",
-    "q": "^1.3.0"
+    "q": "^1.4.0"
   },
   "keywords": [
     "markdown",