diff --git a/.editorconfig b/.editorconfig
index 49c154da..db6f34c7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,4 +8,7 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 end_of_line = lf
 # editorconfig-tools is unable to ignore longs strings or urls
-max_line_length = null
+max_line_length = off
+
+[CHANGELOG.md]
+indent_size = false
diff --git a/packages/eslint-config-airbnb-base/package.json b/packages/eslint-config-airbnb-base/package.json
index a35f3652..2bb9923d 100644
--- a/packages/eslint-config-airbnb-base/package.json
+++ b/packages/eslint-config-airbnb-base/package.json
@@ -4,7 +4,7 @@
   "description": "Airbnb's base JS ESLint config, following our styleguide",
   "main": "index.js",
   "scripts": {
-    "prelint": "editorconfig-tools check * rules/* test/*",
+    "prelint": "eclint check * rules/* test/*",
     "lint": "eslint --report-unused-disable-directives .",
     "pretests-only": "node ./test/requires",
     "tests-only": "babel-tape-runner ./test/test-*.js",
@@ -55,7 +55,7 @@
   "devDependencies": {
     "babel-preset-airbnb": "^2.6.0",
     "babel-tape-runner": "^2.0.1",
-    "editorconfig-tools": "^0.1.1",
+    "eclint": "^2.8.1",
     "eslint": "^4.19.1 || ^5.3.0",
     "eslint-find-rules": "^3.4.0",
     "eslint-plugin-import": "^2.18.2",
diff --git a/packages/eslint-config-airbnb-base/test/requires.js b/packages/eslint-config-airbnb-base/test/requires.js
index 180a09bf..8176480f 100644
--- a/packages/eslint-config-airbnb-base/test/requires.js
+++ b/packages/eslint-config-airbnb-base/test/requires.js
@@ -1,7 +1,4 @@
-/* eslint
-   strict: 0,
-   global-require: 0,
- */
+/* eslint strict: 0, global-require: 0 */
 
 'use strict';
 
diff --git a/packages/eslint-config-airbnb/package.json b/packages/eslint-config-airbnb/package.json
index c7d7940c..ff57a931 100644
--- a/packages/eslint-config-airbnb/package.json
+++ b/packages/eslint-config-airbnb/package.json
@@ -4,7 +4,7 @@
   "description": "Airbnb's ESLint config, following our styleguide",
   "main": "index.js",
   "scripts": {
-    "prelint": "editorconfig-tools check * rules/* test/*",
+    "prelint": "eclint check * rules/* test/*",
     "lint": "eslint .",
     "pretests-only": "node ./test/requires",
     "tests-only": "babel-tape-runner ./test/test-*.js",
@@ -61,7 +61,7 @@
   "devDependencies": {
     "babel-preset-airbnb": "^2.6.0",
     "babel-tape-runner": "^2.0.1",
-    "editorconfig-tools": "^0.1.1",
+    "eclint": "^2.8.1",
     "eslint": "^4.19.1 || ^5.3.0",
     "eslint-find-rules": "^3.4.0",
     "eslint-plugin-import": "^2.18.2",
diff --git a/packages/eslint-config-airbnb/test/requires.js b/packages/eslint-config-airbnb/test/requires.js
index 0ab4aae5..96431852 100644
--- a/packages/eslint-config-airbnb/test/requires.js
+++ b/packages/eslint-config-airbnb/test/requires.js
@@ -1,7 +1,4 @@
-/* eslint
-   strict: 0,
-   global-require: 0,
- */
+/* eslint strict: 0, global-require: 0 */
 
 'use strict';