diff --git a/.editorconfig b/.editorconfig
index 01c3e76ec8..efe5869a73 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,20 @@
 root = true
 
-[**.{js,json,less}]
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[Makefile]
+indent_style = tab
+
+[**.py]
 indent_style = space
 indent_size = 4
+
+[**.{js,less}]
+indent_style = space
+indent_size = 4
+
+[**.{json}]
+indent_style = space
+indent_size = 2