diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000..42ff3294fd16a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+[*]
+end_of_line = lf
+insert_final_newline = false
+charset = utf-8
+max_line_length = 80
+trim_trailing_whitespace = true
+
+[*.{html,js,json,sass,md,mmark,toml,yaml}]
+indent_style = space
+indent_size = 2
+
+[*.{sh}]
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab
diff --git a/.gitignore b/.gitignore
index ebf3b389263d0..50d954cf3d921 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,9 +31,6 @@ nohup.out
 public/
 resources/
 
-# User-specific editorconfig files
-.editorconfig
-
 # Netlify Functions build output
 package-lock.json
 functions/