diff --git a/packages/eslint-config-airbnb-base/package.json b/packages/eslint-config-airbnb-base/package.json
index 51c99818..982d27bc 100644
--- a/packages/eslint-config-airbnb-base/package.json
+++ b/packages/eslint-config-airbnb-base/package.json
@@ -47,7 +47,7 @@
   "devDependencies": {
     "babel-preset-airbnb": "^2.1.1",
     "babel-tape-runner": "^2.0.1",
-    "eslint": "^3.11.1",
+    "eslint": "^3.12.0",
     "eslint-find-rules": "^1.14.3",
     "eslint-plugin-import": "^2.2.0",
     "in-publish": "^2.0.0",
@@ -55,7 +55,7 @@
     "tape": "^4.6.3"
   },
   "peerDependencies": {
-    "eslint": "^3.11.1",
+    "eslint": "^3.12.0",
     "eslint-plugin-import": "^2.2.0"
   },
   "engines": {
diff --git a/packages/eslint-config-airbnb-base/rules/errors.js b/packages/eslint-config-airbnb-base/rules/errors.js
index 1849e8db..bade2a1c 100644
--- a/packages/eslint-config-airbnb-base/rules/errors.js
+++ b/packages/eslint-config-airbnb-base/rules/errors.js
@@ -9,6 +9,10 @@ module.exports = {
       functions: 'always-multiline',
     }],
 
+    // Disallow await inside of loops
+    // http://eslint.org/docs/rules/no-await-in-loop
+    'no-await-in-loop': 'error',
+
     // disallow assignment in conditional expressions
     'no-cond-assign': ['error', 'always'],