diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..d673aaa2d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+# 4 space indentation
+[*.{c,h}]
+indent_style = space
+indent_size = 2
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab