diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..897bdf0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,43 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 160
+quote_type = single
+
+[test/*]
+max_line_length = off
+
+[LICENSE.md]
+indent_size = off
+
+[*.md]
+max_line_length = off
+
+[*.json]
+max_line_length = off
+
+[Makefile]
+max_line_length = off
+
+[CHANGELOG.md]
+indent_style = space
+indent_size = 2
+
+[LICENSE]
+indent_size = 2
+max_line_length = off
+
+[coverage/**/*]
+indent_size = off
+indent_style = off
+indent = off
+max_line_length = off
+
+[.nycrc]
+indent_style = tab
diff --git a/package.json b/package.json
index 9a09162..5c72882 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,8 @@
 		"test:shimmed:es6-shim": "node --es-staging test/shimmed-es6.js",
 		"coverage": "covert test/*.js",
 		"prelint": "es-shim-api --bound",
-		"lint": "eslint .",
-		"postlint": "npm run eccheck",
-		"eccheck": "eclint check *.js **/*.js > /dev/null",
+		"lint": "eslint --ext=js,mjs .",
+		"postlint": "eclint check $(git ls-files | xargs find 2> /dev/null | grep -vE 'node_modules|\\.git')",
 		"version": "auto-changelog && git add CHANGELOG.md",
 		"postversion": "auto-changelog && git add CHANGELOG.md && git commit --no-edit --amend && git tag -f \"v$(node -e \"console.log(require('./package.json').version)\")\""
 	},