diff --git a/create_symlinks.sh b/create_symlinks.sh
index e77c0f2..d85f5ec 100755
--- a/create_symlinks.sh
+++ b/create_symlinks.sh
@@ -14,8 +14,8 @@ link_file() {
 mkdir -p $HOME/.config
 which git >/dev/null 2>&1 && link_file git .config/git ../
 if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
-	mkdir -p $HOME/.gnupg
-	link_file gpg.conf .gnupg/gpg.conf ../
+	mkdir -p $HOME/.local/share/gnupg
+	link_file gpg.conf .local/share/gnupg/gpg.conf ../../../
 fi
 which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf
 which vim >/dev/null 2>&1 && link_file vim .config/vim ../
diff --git a/fish/config.fish b/fish/config.fish
index f83897d..8bef629 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -34,3 +34,4 @@ 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'
+set -x GNUPGHOME $XDG_DATA_HOME/gnupg
diff --git a/fish/functions/gpg-sftp.fish b/fish/functions/gpg-sftp.fish
index d3c4cf1..ded5ae5 100644
--- a/fish/functions/gpg-sftp.fish
+++ b/fish/functions/gpg-sftp.fish
@@ -1,4 +1,4 @@
 function gpg-sftp
-    set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
+    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     sftp $argv
 end
diff --git a/fish/functions/gpg-ssh-add.fish b/fish/functions/gpg-ssh-add.fish
index 514efdd..e27b4d2 100644
--- a/fish/functions/gpg-ssh-add.fish
+++ b/fish/functions/gpg-ssh-add.fish
@@ -1,4 +1,4 @@
 function gpg-ssh-add
-    set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
+    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     ssh-add $argv
 end
diff --git a/fish/functions/gpg-ssh.fish b/fish/functions/gpg-ssh.fish
index 9362b2f..ab725e0 100644
--- a/fish/functions/gpg-ssh.fish
+++ b/fish/functions/gpg-ssh.fish
@@ -1,4 +1,4 @@
 function gpg-ssh
-    set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
+    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
     ssh $argv
 end
diff --git a/zshrc b/zshrc
index eb79521..a585a98 100644
--- a/zshrc
+++ b/zshrc
@@ -5,6 +5,7 @@ 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'
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 LISTMAX=32768
 WORDCHARS="*?[];!#~"
 local grep=""