diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..f58613fb0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[**.yml]
+indent_size = 2