diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..ec65ae5fe0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{js, test}/modules/**.js, test/modules/**.js}]
+indent_size = 2