diff --git a/bootstrap.sh b/bootstrap.sh
index d5dd427..d48a0fa 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -17,6 +17,7 @@ git clone https://github.com/honza/vim-snippets
 git clone https://github.com/scrooloose/syntastic vim-syntastic
 git clone https://github.com/powerline/fonts vim-powerline-fonts
 git clone https://github.com/trapd00r/LS_COLORS.git dircolors
+git clone https://github.com/editorconfig/editorconfig-vim vim-editorconfig
 
 # Private
 git clone stv0g@lian.0l.de:/var/git/private/pass.git
diff --git a/home/.editorconfig b/home/.editorconfig
new file mode 100644
index 0000000..5281c16
--- /dev/null
+++ b/home/.editorconfig
@@ -0,0 +1,14 @@
+# EditorConfig is awesome: http://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
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = tab
+indent_size = 8
+tab_width = 8
diff --git a/home/.vim/bundle/editorconfig b/home/.vim/bundle/editorconfig
new file mode 120000
index 0000000..86ec2ed
--- /dev/null
+++ b/home/.vim/bundle/editorconfig
@@ -0,0 +1 @@
+../../../../vim-editorconfig/
\ No newline at end of file