diff --git a/.editorconfig b/.editorconfig
index 1c98faa..787d477 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,6 +3,14 @@ root = true
 [*]
 end_of_line = lf
 charset = utf-8
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+end_of_line = lf
+charset = utf-8
 indent_style = tab
 indent_size = 4
 insert_final_newline = true