diff --git a/.eslintrc b/.eslintrc
index a3a0894af1d..5844375527f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -35,6 +35,8 @@
     "no-unused-vars": [2],
     "no-use-before-define": [2, "nofunc"],
     "no-loop-func": [2],
-    "no-console": [0]
+    "no-console": [0],
+    "no-unexpected-multiline": [2],
+    "no-unused-labels": [2]
   },
 }
diff --git a/package.json b/package.json
index 2d66fe0bbaf..b6060ebb3a0 100644
--- a/package.json
+++ b/package.json
@@ -82,9 +82,9 @@
     "browserify": "^13.0.0",
     "browserify-transform-tools": "^1.5.1",
     "ecstatic": "^1.4.0",
-    "eslint": "^1.10.3",
+    "eslint": "^2.1.0",
     "falafel": "^1.2.0",
-    "glob": "^6.0.4",
+    "glob": "^7.0.0",
     "jasmine-core": "^2.3.4",
     "karma": "^0.13.15",
     "karma-browserify": "^5.0.1",
diff --git a/src/.eslintrc b/src/.eslintrc
index 59dd2646b8b..c09adc770a7 100644
--- a/src/.eslintrc
+++ b/src/.eslintrc
@@ -3,6 +3,10 @@
   "env": {
     "browser": true
   },
+  "globals": {
+    "Promise": true,
+    "Uint8Array": true
+  },
   "rules": {
     "strict": [2, "global"]
   }