diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..b08a27f2a2
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+charset = utf_8
+
+[Makefile]
+indent_style = tab
+tab_width = 4