diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..88e7ca4
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# This is the top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.{java}]
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab