diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..dd0182d9
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+charset = utf-8
diff --git a/vim/vundles/vim-improvements.vundle b/vim/vundles/vim-improvements.vundle
index 304b016b..21fdd09e 100644
--- a/vim/vundles/vim-improvements.vundle
+++ b/vim/vundles/vim-improvements.vundle
@@ -27,3 +27,5 @@ Bundle "vim-scripts/AutoTag.git"
 Bundle "vim-scripts/lastpos.vim"
 Bundle "vim-scripts/sudo.vim"
 Bundle "goldfeld/ctrlr.vim"
+Bundle "editorconfig/editorconfig-vim"
+