diff --git a/.gitmodules b/.gitmodules
index 91af43d..563cc7c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,3 +73,6 @@
 [submodule ".vim/bundle/ctrlp"]
 	path = .vim/bundle/ctrlp
 	url = https://github.com/kien/ctrlp.vim.git
+[submodule ".vim/bundle/vim-bufferline"]
+	path = .vim/bundle/vim-bufferline
+	url = https://github.com/bling/vim-bufferline
diff --git a/.vim/plugin/buftabs.vim b/.vim/buftabs.vim
similarity index 100%
rename from .vim/plugin/buftabs.vim
rename to .vim/buftabs.vim
diff --git a/.vim/bundle/vim-bufferline b/.vim/bundle/vim-bufferline
new file mode 160000
index 0000000..f501353
--- /dev/null
+++ b/.vim/bundle/vim-bufferline
@@ -0,0 +1 @@
+Subproject commit f501353aeafdfd9137b5f7847d598b86065be133
diff --git a/.vimrc b/.vimrc
index 0e4a708..aa57ab8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -137,7 +137,12 @@ let g:LustyJugglerShowKeys = 'a'
 " * Buftabs
 let g:buftabs_only_basename = 1
 "let g:buftabs_in_statusline=1
-"
+
+" Bufferline
+let g:bufferline_echo = 0
+let g:bufferline_modified = '+'
+let g:bufferline_show_bufnr = 1
+
 " * NERDTree
 let g:NERDChristmasTree = 1
 let g:NERDChristmasTree = 1