diff --git a/config/vim/init.vim b/config/vim/init.vim
index 0a7cb39..cda541d 100644
--- a/config/vim/init.vim
+++ b/config/vim/init.vim
@@ -71,14 +71,14 @@ else
 endif
 
 for s:dir in ['backup', 'swap', 'undo']
-  call s:ensure_dir($XDG_CACHE_HOME . '/vim/' . s:dir)
+  call s:ensure_dir($XDG_STATE_HOME . '/vim/' . s:dir)
 endfor
 
-set backupdir=.,$XDG_CACHE_HOME/vim/backup
-set directory=.,$XDG_CACHE_HOME/vim/swap
+set backupdir=.,$XDG_STATE_HOME/vim/backup
+set directory=.,$XDG_STATE_HOME/vim/swap
 if exists('+undofile')
   set undofile
-  set undodir=$XDG_CACHE_HOME/vim/undo
+  set undodir=$XDG_STATE_HOME/vim/undo
 endif
 
 let g:airline_powerline_fonts = 1
diff --git a/vimrc b/vimrc
index fc6777b..fa8d3c2 100644
--- a/vimrc
+++ b/vimrc
@@ -1,11 +1,11 @@
-for [s:var, s:value] in items({'XDG_CONFIG_HOME': '~/.config', 'XDG_CACHE_HOME': '~/.cache', 'XDG_DATA_HOME': '~/.local/share'})
+for [s:var, s:value] in items({'XDG_CONFIG_HOME': '~/.config', 'XDG_CACHE_HOME': '~/.cache', 'XDG_DATA_HOME': '~/.local/share', 'XDG_STATE_HOME': '~/.local/state'})
   if (empty(eval('$' . s:var)))
     exec 'let $' . s:var . ' = expand(s:value)'
   endif
 endfor
 
 set runtimepath=$XDG_CONFIG_HOME/vim,$XDG_CACHE_HOME/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$XDG_CONFIG_HOME/vim/after,$XDG_CACHE_HOME/vim/after
-set viminfo+=n$XDG_CACHE_HOME/vim/viminfo
+set viminfo+=n$XDG_STATE_HOME/vim/viminfo
 if exists('+packpath')
   set packpath^=$XDG_CONFIG_HOME/vim,$XDG_CACHE_HOME/vim
 endif