diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000000..e011592c540
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".vim/bundle/Vundle.vim"]
+	path = .vim/bundle/Vundle.vim
+	url = git@github.com:gmarik/Vundle.vim.git
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
new file mode 160000
index 00000000000..0b28e334e65
--- /dev/null
+++ b/.vim/bundle/Vundle.vim
@@ -0,0 +1 @@
+Subproject commit 0b28e334e65b6628b0a61c412fcb45204a2f2bab
diff --git a/.vimrc b/.vimrc
index a78f59de9a0..6834b7b3258 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,21 @@
-" Make Vim more useful
-set nocompatible
+set nocompatible              " be iMproved, required
+filetype off                  " required
+
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+" let Vundle manage Vundle, required
+Plugin 'gmarik/Vundle.vim'
+
+Plugin 'tpope/vim-fugitive'
+Plugin 'vim-scripts/AutoComplPop'
+
+" All Plugins must be added before the following line
+call vundle#end()            " required
+filetype plugin indent on    " required
+
+
 " Use the OS clipboard by default (on versions compiled with `+clipboard`)
 set clipboard=unnamed
 " Enhance command-line completion