diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..002ee905c80
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,22 @@
+root = true
+
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+indent_size = 4
+indent_style = space
+
+[*.{yml,yaml}]
+indent_size = 2
+indent_style = space
+
+[*.{patch,diff}]
+indent_style = unset
+end_of_line = unset
+charset = unset
+trim_trailing_whitespace = unset
diff --git a/.gitignore b/.gitignore
index 0a1b2da0284..e91ff787554 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 
 # exclude everything in root except files and directories from void-packages
 /*
+!/.editorconfig
 !/.gitattributes
 !/.github
 !/.gitignore