diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..4a65e5d5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+indent_style = space
+indent_size = 2
+
+trim_trailing_whitespace = true
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 37205bbc..8b1fa5a7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,6 +49,7 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 We're still working on providing a more concise code style for your IDE and getting a linter on GitHub, but for now try to keep the following:
 
 * If you're developing on Visual Studio, please use `Parse.vssettings`.
+* We use [editorconfig](https://editorconfig.org) to manage basic editor settings, please install a compatible plugin for your preferred environment.
 * Most importantly, match the existing code style as much as possible.
 * Try to keep lines under 120 characters, if possible.