diff --git a/create_symlinks.sh b/create_symlinks.sh
index 1a9ae4e..4fedf21 100755
--- a/create_symlinks.sh
+++ b/create_symlinks.sh
@@ -18,10 +18,7 @@ if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
 	link_file gpg.conf .gnupg/gpg.conf ../
 fi
 which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf
-if which vim >/dev/null 2>&1; then
-	link_file vim .vim
-	link_file vimrc .vimrc
-fi
+which vim >/dev/null 2>&1 && link_file vim .config/vim ../
 which fish >/dev/null 2>&1 && link_file fish .config/fish ../
 which youtube-dl >/dev/null 2>&1 && link_file youtube-dl .config/youtube-dl ../
 which zsh >/dev/null 2>&1 && link_file zshrc .zshrc
diff --git a/fish/config.fish b/fish/config.fish
index 8a0ec50..f83897d 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -24,5 +24,13 @@ set -g fish_color_vcs_braces 29bc7d
 set -g _fish_abbr_gpg gpg2
 set -g _fish_abbr_vi vim
 
+test -n "$XDG_CONFIG_HOME"
+or set -x XDG_CONFIG_HOME $HOME/.config
+test -n "$XDG_CACHE_HOME"
+or set -x XDG_CACHE_HOME $HOME/.cache
+test -n "$XDG_DATA_HOME"
+or set -x XDG_DATA_HOME $HOME/.local/share
+
 set -x EDITOR vim
+set -x VIMINIT "source $XDG_CONFIG_HOME/vim/vimrc"
 set -x LS_COLORS 'di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.gpg=36:*.rar=36:*.tar=36:*.tbz2=36:*.tgz=36:*.xz=36:*.zip=36:*.orig=90:*~=90'
diff --git a/vimrc b/vim/vimrc
similarity index 89%
rename from vimrc
rename to vim/vimrc
index 4a7a81b..2307a3d 100644
--- a/vimrc
+++ b/vim/vimrc
@@ -1,3 +1,6 @@
+set runtimepath+=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after
+set viminfofile=$XDG_CACHE_HOME/vim/viminfo
+
 source $VIMRUNTIME/vimrc_example.vim
 
 set t_Co=256
diff --git a/zshrc b/zshrc
index 2677c29..eb79521 100644
--- a/zshrc
+++ b/zshrc
@@ -1,4 +1,8 @@
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
 export EDITOR="vim"
+export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
 export PAGER="less"
 export LS_COLORS='di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.gpg=36:*.rar=36:*.tar=36:*.tbz2=36:*.tgz=36:*.xz=36:*.zip=36:*.orig=90:*~=90'
 LISTMAX=32768