diff --git a/Makefile b/Makefile
index 66ab6ff..00f9515 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ FILES2 = msmtprc
 
 .PHONY: install clean check
 
-install: install-conf install-vim-vundle
+install: install-conf install-vim-neobundle
 
 ifeq ($(OS),Windows_NT)
 
@@ -30,9 +30,9 @@ VIM_BUNDLE_DIR = $(HOME)/.vim/bundle
 
 endif
 
-install-vim-vundle:
+install-vim-neobundle:
 	mkdir -p $(VIM_BUNDLE_DIR)
-	test -d $(VIM_BUNDLE_DIR)/vundle || git clone https://github.com/gmarik/vundle.git $(VIM_BUNDLE_DIR)/vundle
+	test -d $(VIM_BUNDLE_DIR)/neobundle.vim || git clone https://github.com/Shougo/neobundle.vim.git $(VIM_BUNDLE_DIR)/neobundle.vim
 
 clean:
 
diff --git a/vimrc b/vimrc
index 992b10f..a9c716a 100644
--- a/vimrc
+++ b/vimrc
@@ -1,40 +1,55 @@
 se nocompatible
 filetype off
 
-se rtp+=~/.vim/bundle/vundle
-call vundle#rc()
+se rtp+=~/.vim/bundle/neobundle.vim
+call neobundle#begin(expand('~/.vim/bundle/'))
 
-Bundle 'gmarik/vundle'
+NeoBundleFetch 'Shougo/neobundle.vim'
 
-Bundle 'tpope/vim-sensible'
+NeoBundle 'tpope/vim-sensible'
 
-Bundle 'Valloric/YouCompleteMe'
+NeoBundle 'Valloric/YouCompleteMe' , {
+      \ 'build' : {
+      \     'unix' : './install.sh --clang-completer --system-libclang'
+      \   },
+      \ }
 
-Bundle 'nanotech/jellybeans.vim'
-Bundle 'majutsushi/tagbar'
-Bundle 'bling/vim-airline'
-Bundle 'kien/ctrlp.vim'
+NeoBundle 'Shougo/vimproc.vim' , {
+      \ 'build' : {
+      \     'windows' : 'make -f make_mingw32.mak',
+      \     'cygwin' : 'make -f make_cygwin.mak',
+      \     'mac' : 'make -f make_mac.mak',
+      \     'unix' : 'make -f make_unix.mak',
+      \   },
+      \ }
 
-Bundle 'kchmck/vim-coffee-script'
-Bundle 'ledger/vim-ledger'
+NeoBundle 'nanotech/jellybeans.vim'
+NeoBundle 'majutsushi/tagbar'
+NeoBundle 'bling/vim-airline'
+NeoBundle 'kien/ctrlp.vim'
 
-Bundle 'eagletmt/neco-ghc'
+NeoBundle 'kchmck/vim-coffee-script'
+NeoBundle 'ledger/vim-ledger'
 
-Bundle 'marijnh/tern_for_vim'
+NeoBundle 'eagletmt/neco-ghc'
 
-Bundle 'jnwhiteh/vim-golang'
-Bundle 'Blackrush/vim-gocode'
+NeoBundle 'marijnh/tern_for_vim'
 
-Bundle 'zah/nimrod.vim'
+NeoBundle 'jnwhiteh/vim-golang'
+NeoBundle 'Blackrush/vim-gocode'
 
-Bundle 'wting/rust.vim'
+NeoBundle 'zah/nimrod.vim'
 
-Bundle 'derekwyatt/vim-scala'
+NeoBundle 'wting/rust.vim'
 
-Bundle 'othree/html5.vim'
+NeoBundle 'derekwyatt/vim-scala'
+
+NeoBundle 'othree/html5.vim'
 
 " vim-sleuth?
 
+call neobundle#end()
+
 filetype plugin indent on
 
 set tw=0 expandtab ts=8 sts=2 sw=2 sm ai si