diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..a6b3f742
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,34 @@
+# .editorconfig
+# http://editorconfig.org/
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.bat]
+end_of_line = crlf
+
+[*.go]
+indent_size = 4
+indent_style = tab
+
+[*.html]
+indent_size = 4
+
+[*Makefile]
+indent_size = 4
+indent_style = tab
+
+[*.php]
+indent_size = 4
+
+[*.py]
+indent_size = 4
+
+[*.xml]
+indent_size = 4