diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..572c3c9ccd
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+# EditorConfig: http://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+# 3 space indentation
+[*.{c,h,js,css,html}]
+indent_style = space
+indent_size = 3
+
+# Tab indentation
+[Makefile*]
+indent_style = tab