diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..0600cb9dc
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = crlf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.lua]
+indent_style = space
+indent_size = 4
+
+[*.{js,css}]
+indent_style = space
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index e3412b963..07d172fd9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-* text=auto eol=lf
+#* text=auto eol=crlf
 
 # Ignored files by `git archive`
 /.github                export-ignore