diff --git a/.eslintrc b/.eslintrc
index 14b4feea30..80b56f8293 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -22,6 +22,25 @@ env:
 # Below we adjust rules specific to horizon's usage of openstack's linting
 # rules, and its own plugin inclusions.
 rules:
+  #############################################################################
+  # Disabled Rules from eslint-config-openstack
+  #############################################################################
+  valid-jsdoc: 1
+  no-undefined: 1
+  brace-style: 1
+  no-multi-spaces: 1
+  no-unused-vars: 1
+  strict: 1
+  no-extra-parens: 1
+  eqeqeq: 1
+  consistent-return: 1
+  callback-return: 1
+  radix: 1
+  guard-for-in: 1
+  block-scoped-var: 1
+  semi-spacing: 1
+  no-redeclare: 1
+  no-new: 1
 
   #############################################################################
   # Angular Plugin Customization
@@ -33,4 +52,4 @@ rules:
 
   # Remove after migrating to angular 1.4 or later.
   angular/ng_no_cookiestore:
-    - 1
\ No newline at end of file
+    - 1
diff --git a/package.json b/package.json
index 62c3aa1aa1..b770f13a84 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
   "repository": "none",
   "license": "Apache 2.0",
   "devDependencies": {
-    "eslint": "1.2.0",
-    "eslint-config-openstack": "1.2.2",
+    "eslint": "1.2.1",
+    "eslint-config-openstack": "1.2.3",
     "eslint-plugin-angular": "0.4.0",
     "jasmine-core": "2.2.0",
     "karma": "0.12.31",