diff --git a/bootstrap.sh b/bootstrap.sh
index c6f765d..494f114 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,6 +3,9 @@
 # Current dir
 BASEDIR=$(pwd)
 
+# Update git submodules
+git submodule init && git submodule update
+
 # ln the various files
 test -L $HOME/.curlrc || ln -f -s $BASEDIR/curlrc $HOME/.curlrc
 test -L $HOME/.gitignore || ln -f -s $BASEDIR/gitignore $HOME/.gitignore
@@ -10,7 +13,8 @@ test -L $HOME/.hushlogin || ln -f -s $BASEDIR/hushlogin $HOME/.hushlogin
 test -L $HOME/.zshrc || ln -f -s $BASEDIR/zshrc $HOME/.zshrc
 
 # ln vim files
-test -L $HOME/.vim || ln -f -s $BASEDIR/vim $HOME/.vim
+test -d $HOME/.vim && rm -rf $HOME/.vim
+ln -s $BASEDIR/vim $HOME/.vim
 test -L $HOME/.vimrc || ln -f -s $HOME/.vim/vimrc $HOME/.vimrc
 
 # .gitconfig gets edited by .extra so we won’t symlink it, but copy it