diff --git a/.config/vim/vimrc.d/40-keybindings.vim b/.config/vim/vimrc.d/40-keybindings.vim
index 7703860..3050b00 100644
--- a/.config/vim/vimrc.d/40-keybindings.vim
+++ b/.config/vim/vimrc.d/40-keybindings.vim
@@ -50,6 +50,8 @@ map <leader>ss :set spelllang=
 " Umlaute and sz in Insert and Command-line mode when spelllang is set to de
 autocmd OptionSet spelllang call NewSpellLang(v:option_new, v:option_old)
 function! NewSpellLang(new_lang, old_lang)
+	let &spellfile = $XDG_DATA_HOME . '/vim/spell/' . a:new_lang . '.utf-8.add'
+
 	let mappings = {
 	\ 'ae': 'ä',
 	\ 'Ae': 'Ä',
diff --git a/.config/vim/xdg.vim b/.config/vim/xdg.vim
index 590d207..480d1b4 100644
--- a/.config/vim/xdg.vim
+++ b/.config/vim/xdg.vim
@@ -40,6 +40,11 @@ if (!has('nvim'))
 	set viminfo+=n$XDG_DATA_HOME/vim/viminfo
 endif
 
+if !isdirectory($XDG_DATA_HOME . '/vim/spell')
+	call mkdir($XDG_DATA_HOME . '/vim/spell', 'p')
+endif
+let &spellfile = $XDG_DATA_HOME . '/vim/spell/' . &spelllang . '.utf-8.add'
+
 set runtimepath-=~/.vim       runtimepath^=$XDG_CONFIG_HOME/vim
 set runtimepath-=~/.vim/after runtimepath+=$XDG_CONFIG_HOME/vim/after
 set packpath-=~/.vim          packpath^=$XDG_CONFIG_HOME/vim