diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..9e3e77c8d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+[*]
+indent_style    = tab
+indent_size     = 4
+end_of_line     = LF
+max_line_length = 100
+
+insert_final_newline = true
+
+[{*.c, *.cpp, *.sc, *.sh, *.lua, *.m, *.mm, *.mk, makefile}]
+trim_trailing_whitespace = true
diff --git a/.gitattributes b/.gitattributes
index 4a7180c2c..e89cf4126 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,10 @@
+*.c   eol=lf
 *.cpp eol=lf
 *.h   eol=lf
 *.sc  eol=lf
 *.sh  eol=lf
+*.m   eol=lf
+*.mm  eol=lf
 *.md  eol=lf
 *.lua eol=lf
 *.mk  eol=lf