diff --git a/.eslintrc.json b/.eslintrc.json
index b8afa45f09..3a0aa7460d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,34 +1,3 @@
 {
-    "extends": "airbnb",
-    "plugins": [
-        "jsx-a11y"
-    ],
-    "rules": {
-        "***AIRBNB OVERRIDES***" : [0],
-        "import/no-unresolved": [0],
-        "indent": [2, 4, { "SwitchCase": 1 }],
-        "no-underscore-dangle": [0],
-        "max-len": [2, 120],
-        "react/jsx-indent": [2, 4],
-        "react/jsx-indent-props": [2, 4],
-        "react/jsx-boolean-value": [2, "always"],
-        "react/jsx-key": 2,
-        "***A11Y***": [0],
-        "jsx-a11y/aria-props": 2,
-        "jsx-a11y/aria-proptypes": 2,
-        "jsx-a11y/aria-role": 2,
-        "jsx-a11y/aria-unsupported-elements": 2,
-        "jsx-a11y/href-no-hash": 2,
-        "jsx-a11y/img-has-alt": 2,
-        "jsx-a11y/img-redundant-alt": 2,
-        "jsx-a11y/label-has-for": 2,
-        "jsx-a11y/mouse-events-have-key-events": 2,
-        "jsx-a11y/no-access-key": 2,
-        "jsx-a11y/no-onchange": 0,
-        "jsx-a11y/onclick-has-focus": 2,
-        "jsx-a11y/onclick-has-role": 2,
-        "jsx-a11y/role-has-required-aria-props": 2,
-        "jsx-a11y/role-supports-aria-props": 2,
-        "jsx-a11y/tabindex-no-positive": 2
-    }
+    "extends": "ffe"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e352809721..b1b2e904a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## Version 1.1.1
+* Upgrade eslint to use ffe config
+
 ## Version 1.1.0
 * Added styling support for outer container using style prop
 * Bumped ffe-icons-react dependency
diff --git a/package.json b/package.json
index 120d05037b..d1c3de22c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffe-system-message-react",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "SpareBank 1 System Message komponent",
   "main": "lib/index.js",
   "scripts": {
@@ -40,11 +40,11 @@
     "cross-env": "^1.0.8",
     "css-loader": "^0.23.1",
     "enzyme": "^2.3.0",
-    "eslint": "^2.13.1",
-    "eslint-config-airbnb": "^9.0.1",
-    "eslint-plugin-import": "^1.10.0",
-    "eslint-plugin-jsx-a11y": "^1.5.3",
-    "eslint-plugin-react": "^5.2.2",
+    "eslint": "^3.12.2",
+    "eslint-config-ffe": "^6.0.0",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-jsx-a11y": "^3.0.2",
+    "eslint-plugin-react": "^6.8.0",
     "expect.js": "^0.3.1",
     "ffe-core": "^8.1.0",
     "ffe-icons-react": "^2.1.0",