diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..0da94f6f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+max_line_length = 120
+
+[*.java]
+indent_style = tab
+
+[*.xml]
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 05907f41..7c5d92a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .*
+!.editorconfig
 !.git*
 !.idea
 !.mailmap