diff --git a/scripts/vim-setup b/scripts/vim-setup
index 174538d..c46c9d8 100755
--- a/scripts/vim-setup
+++ b/scripts/vim-setup
@@ -5,7 +5,7 @@ sudo pacman -S python --needed --noconfirm
 #######################
 ## Initialise Vundle ##
 #######################
-mkdir -p ~/.vim/bundle
+mkdir -p ~/.vim/{bundle,swapfiles}
 git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 vim +PluginInstall +qall
 
@@ -14,4 +14,5 @@ vim +PluginInstall +qall
 ## Setup YouCompleteMe ##
 #########################
 cd "$YCM"
+git submodule update --init --recursive
 ./install.py --clang-completer