diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json
index 5887859e..f674595d 100644
--- a/packages/eslint-config-airbnb/package.json
+++ b/packages/eslint-config-airbnb/package.json
@@ -54,7 +54,7 @@
     "eslint-find-rules": "^1.13.0",
     "eslint-plugin-import": "^1.13.0",
     "eslint-plugin-jsx-a11y": "^2.1.0",
-    "eslint-plugin-react": "^6.0.0",
+    "eslint-plugin-react": "^6.1.0",
     "in-publish": "^2.0.0",
     "react": "> 0.13.0",
     "safe-publish-latest": "^1.0.1",
@@ -64,7 +64,7 @@
     "eslint": "^3.3.0",
     "eslint-plugin-jsx-a11y": "^2.1.0",
     "eslint-plugin-import": "^1.13.0",
-    "eslint-plugin-react": "^6.0.0"
+    "eslint-plugin-react": "^6.1.0"
   },
   "engines": {
     "node": ">= 4"
diff --git a/packages/eslint-config-airbnb/rules/react.js b/packages/eslint-config-airbnb/rules/react.js
index 53961c36..4bb15b6b 100644
--- a/packages/eslint-config-airbnb/rules/react.js
+++ b/packages/eslint-config-airbnb/rules/react.js
@@ -243,6 +243,15 @@ module.exports = {
     // warn against using findDOMNode()
     // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-find-dom-node.md
     'react/no-find-dom-node': 2,
+
+    // Forbid certain props on Components
+    // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/forbid-component-props.md
+    'react/forbid-component-props': [0, { forbid: [] }],
+
+    // Prevent problem with children and props.dangerouslySetInnerHTML
+    // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-danger-with-children.md
+    // TODO: enable, semver-major
+    'react/no-danger-with-children': 0,
   },
 
   settings: {