diff --git a/.gitmodules b/.gitmodules
index 04ebb8b..4b6a596 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "oh-my-zsh"]
 	path = oh-my-zsh
 	url = https://github.com/gebner/oh-my-zsh.git
-[submodule "vim-pathogen"]
-	path = vim-pathogen
-	url = https://github.com/tpope/vim-pathogen.git
 [submodule "mutt-gnome-keyring"]
 	path = mutt-gnome-keyring
 	url = https://github.com/wbolster/mutt-gnome-keyring.git
diff --git a/Makefile b/Makefile
index de5b89e..66ab6ff 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ FILES2 = msmtprc
 
 .PHONY: install clean check
 
-install: install-conf install-vim-pathogen
+install: install-conf install-vim-vundle
 
 ifeq ($(OS),Windows_NT)
 
@@ -13,9 +13,8 @@ install-conf:
 	cp gitconfig $(HOME)\.gitconfig
 	cp vimrc $(HOME)\_vimrc
 	cp gvimrc $(HOME)\_gvimrc
-	cp vim-pathogen/autoload/pathogen.vim $(HOME)\vimfiles\autoload
 
-VIM_PATHOGEN_DIR = $(HOME)\vimfiles\bundle
+VIM_BUNDLE_DIR = $(HOME)/vimfiles/bundle
 
 else
 
@@ -23,25 +22,17 @@ install-conf: $(FILES)
 	mkdir -p ~/.ssh ~/.vim/autoload
 	for i in $(FILES); do install -m0644 $$i ~/.$$i; done
 	for i in $(FILES2); do install -m0600 $$i ~/.$$i; done
-	install -m0644 vim-pathogen/autoload/pathogen.vim ~/.vim/autoload/
 
 check: $(FILES)
 	for i in $(FILES); do diff -u ~/.$$i $$i; done
 
-VIM_PATHOGEN_DIR = $(HOME)/.vim/bundle
+VIM_BUNDLE_DIR = $(HOME)/.vim/bundle
 
 endif
 
-vim_inst_bundle = cd $(subst \,/,$(VIM_PATHOGEN_DIR)) && if cd $(1); then git pull; else git clone $(2); fi
-
-install-vim-pathogen:
-	mkdir -p $(VIM_PATHOGEN_DIR)
-	$(call vim_inst_bundle, vim-sensible, https://github.com/tpope/vim-sensible.git)
-	$(call vim_inst_bundle, jellybeans.vim, https://github.com/nanotech/jellybeans.vim.git)
-	$(call vim_inst_bundle, vim-coffee-script, https://github.com/kchmck/vim-coffee-script.git)
-	$(call vim_inst_bundle, vim-airline, https://github.com/bling/vim-airline.git)
-	$(call vim_inst_bundle, tagbar, https://github.com/majutsushi/tagbar.git)
-	$(call vim_inst_bundle, YouCompleteMe, https://github.com/Valloric/YouCompleteMe.git)
+install-vim-vundle:
+	mkdir -p $(VIM_BUNDLE_DIR)
+	test -d $(VIM_BUNDLE_DIR)/vundle || git clone https://github.com/gmarik/vundle.git $(VIM_BUNDLE_DIR)/vundle
 
 clean:
 
diff --git a/vim-pathogen b/vim-pathogen
deleted file mode 160000
index f1926ab..0000000
--- a/vim-pathogen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f1926ab6731cb1877160ff94d01ea644d257076e
diff --git a/vimrc b/vimrc
index 1112bb7..b414ec8 100644
--- a/vimrc
+++ b/vimrc
@@ -1,3 +1,24 @@
+se nocompatible
+filetype off
+
+se rtp+=~/.vim/bundle/vundle
+call vundle#rc()
+
+Bundle 'gmarik/vundle'
+
+Bundle 'tpope/vim-sensible'
+
+Bundle 'Valloric/YouCompleteMe'
+
+Bundle 'nanotech/jellybeans.vim'
+Bundle 'majutsushi/tagbar'
+Bundle 'bling/vim-airline'
+
+Bundle 'kchmck/vim-coffee-script'
+Bundle 'ledger/vim-ledger'
+
+filetype plugin indent on
+
 set tw=0 expandtab ts=8 sts=2 sw=2 sm ai si
 set ml mls=5				" scan 5 lines for modelines
 syn on						" enable syntax highlighting
@@ -15,8 +36,6 @@ au BufNewFile,BufRead *.factor set ft=factor
 au BufNewFile,BufRead Gemfile set ft=ruby
 au BufReadCmd *.epub call zip#Browse(expand("<amatch>"))
 
-execute pathogen#infect()
-
 set vb                          " turn on the "visual bell" - which is much quieter than the "audio blink"
 set nobackup
 se bs=2