diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..d1fe2c7
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,29 @@
+# EditorConfig is awesome: https://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
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+
+# 2 space indentation
+[*.{yml,sh,vim},vimshrc]
+indent_size = 2
+indent_style = space
+
+# 4 space indentation
+[*.{py,rst}]
+indent_size = 4
+indent_style = space
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+tab_width = 8