diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a59c4ee
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,22 @@
+# EditorConfig - http://EditorConfig.org
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+
+# 4 space indentation
+[*.{conf, php, py, sh}]
+indent_style = space
+indent_size = 4
+
+# 2 space indentation
+[*.{sls,jinja,json,yml}]
+indent_style = space
+indent_size = 2
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab