diff --git a/editorconfig b/editorconfig
new file mode 100644
index 00000000..84d0c199
--- /dev/null
+++ b/editorconfig
@@ -0,0 +1,20 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace
+
+[Makefile]
+indent_style = tab
+
+# Emacs snippets
+[{snippets,templates}/*-mode/*]
+insert_final_newline = false