diff --git a/.clang-format b/.clang-format
index 513238f..daf46c6 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,7 @@ BasedOnStyle: WebKit
 IndentWidth: 4
 ColumnLimit: 80
 ---
-Language: cpp
+Language: Cpp
 PointerAlignment: Middle
 IndentCaseLabels: true
 BinPackArguments: true
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..1b092f0
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+
+[*.{c,cpp,h,hh,py,ts,js,java,m}]
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab