diff --git a/.config/fish/conf.d/gnupg.fish b/.config/fish/conf.d/gnupg.fish
new file mode 100644
index 00000000..9b3ffb3d
--- /dev/null
+++ b/.config/fish/conf.d/gnupg.fish
@@ -0,0 +1,6 @@
+set -e SSH_AGENT_PID
+if test -z $gnupg_SSH_AUTH_SOCK_BY; or test $gnupg_SSH_AUTH_SOCK_BY -ne $fish_pid
+    set -gx SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
+end
+set -gx GPG_TTY (tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
new file mode 100644
index 00000000..85405bc1
--- /dev/null
+++ b/.gnupg/gpg-agent.conf
@@ -0,0 +1 @@
+enable-ssh-support