diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..984d2cba
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,35 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[Dockerfile]
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+indent_size = 8
+
+[*.rb]
+indent_size = 4
+
+[*.rs]
+indent_size = 4
+
+[*.S]
+indent_size = 4
+
+[*.sh]
+indent_size = 4
+
+[*.toml]
+indent_size = 4
+
+[*.{yml,yaml}]
+indent_size = 2