diff --git a/.codeclimate.yml b/.codeclimate.yml
index fcc885c8200..bd32376436b 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -6,7 +6,7 @@ engines:
       - javascript
   eslint:
     enabled: true
-    channel: "eslint-3"
+    channel: "eslint-4"
   fixme:
     enabled: true
 ratings:
diff --git a/.eslintrc b/.eslintrc
index 6a31e4b6ec2..c0e1b26ce6f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,7 +1,3 @@
-ecmaFeatures:
-  modules: true
-  jsx: true
-
 env:
   amd: true
   browser: true
@@ -72,7 +68,7 @@ rules:
   no-lone-blocks: 2
   no-loop-func: 2
   no-magic-number: 0
-  no-multi-spaces: 2
+  no-multi-spaces: [2, {ignoreEOLComments: true}]
   no-multi-str: 2
   no-native-reassign: 2
   no-new-func: 2
@@ -141,7 +137,7 @@ rules:
   func-style: 0
   id-length: 0
   id-match: 0
-  indent: [2, tab]
+  indent: [2, tab, {flatTernaryExpressions: true}]
   jsx-quotes: 0
   key-spacing: 2
   keyword-spacing: 2
diff --git a/package.json b/package.json
index 445dc877ab0..2aa52b31599 100644
--- a/package.json
+++ b/package.json
@@ -10,30 +10,31 @@
     "url": "https://github.com/chartjs/Chart.js.git"
   },
   "devDependencies": {
-    "browserify": "^14.3.0",
-    "browserify-istanbul": "^2.0.0",
-    "bundle-collapser": "^1.2.1",
+    "browserify": "^14.5.0",
+    "browserify-istanbul": "^3.0.1",
+    "bundle-collapser": "^1.3.0",
     "child-process-promise": "^2.2.1",
-    "coveralls": "^2.13.1",
-    "gitbook-cli": "^2.3.0",
+    "coveralls": "^3.0.0",
+    "eslint": "^4.9.0",
+    "gitbook-cli": "^2.3.2",
     "gulp": "3.9.x",
     "gulp-concat": "~2.6.x",
     "gulp-connect": "~5.0.0",
-    "gulp-eslint": "^3.0.1",
+    "gulp-eslint": "^4.0.0",
     "gulp-file": "^0.3.0",
     "gulp-html-validator": "^0.0.5",
     "gulp-insert": "~0.5.0",
-    "gulp-replace": "^0.5.4",
+    "gulp-replace": "^0.6.1",
     "gulp-size": "~2.1.0",
     "gulp-streamify": "^1.0.2",
     "gulp-uglify": "~3.0.x",
     "gulp-util": "~3.0.x",
     "gulp-zip": "~4.0.0",
-    "jasmine": "^2.6.0",
-    "jasmine-core": "^2.6.2",
-    "karma": "^1.7.0",
+    "jasmine": "^2.8.0",
+    "jasmine-core": "^2.8.0",
+    "karma": "^1.7.1",
     "karma-browserify": "^5.1.1",
-    "karma-chrome-launcher": "^2.1.1",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",
     "karma-firefox-launcher": "^1.0.1",
     "karma-jasmine": "^1.1.0",
@@ -42,13 +43,13 @@
     "pixelmatch": "^4.0.2",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.9.0",
-    "yargs": "^8.0.1"
+    "yargs": "^9.0.1"
   },
   "spm": {
     "main": "Chart.js"
   },
   "dependencies": {
     "chartjs-color": "~2.2.0",
-    "moment": "~2.18.0"
+    "moment": "~2.19.1"
   }
 }