diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..028ffdef6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+tab_width = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{Makefile,*.go,go.*}]
+indent_style = tab
+indent_size = 4
+tab_width = 4
+
+[*.py]
+indent_size = 4
+tab_width = 4