diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..f336397
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+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/.vimrc.bundles.local b/.vimrc.bundles.local
index 9f1dfe6..98d4807 100644
--- a/.vimrc.bundles.local
+++ b/.vimrc.bundles.local
@@ -9,3 +9,4 @@ Bundle 'mhinz/vim-startify'
 Bundle 'lifepillar/vim-cheat40'
 Bundle 'ap/vim-css-color'
 Bundle 'junegunn/vim-emoji'
+Bundle 'editorconfig/editorconfig-vim'