diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..65e062de
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[**]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+trim_trailing_whitespace = true
+
+[**.{java,xml}]
+indent_size = 3
+
+[**.{yaml,yml}]
+indent_size = 2