diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..143b0b3da3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines and UTF-8 everywhere
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+charset = utf-8
+
+# 2 space indentation
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab