diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..d9b95d6f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# Match and apply these rules for all file
+# types you open in your code editor
+[*]
+# Unix-style newlines
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index 30ab9ad6..2a991808 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /init.vim
 /doc/tags
 .*
+!.editorconfig
 *.obj
 tags