diff --git a/.bashrc b/.bashrc
index da265c9..ef9ad5c 100644
--- a/.bashrc
+++ b/.bashrc
@@ -31,3 +31,5 @@ unset SSH_AGENT_PID
 if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
   export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
 fi
+export 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 0000000..2bbad42
--- /dev/null
+++ b/.gnupg/gpg-agent.conf
@@ -0,0 +1,6 @@
+default-cache-ttl 3600
+pinentry-program /usr/bin/pinentry-curses
+max-cache-ttl 72000
+default-cache-ttl 72000
+max-cache-ttl-ssh 72000
+default-cache-ttl-ssh 72000
diff --git a/.pam_environment b/.pam_environment
new file mode 100644
index 0000000..b55fba7
--- /dev/null
+++ b/.pam_environment
@@ -0,0 +1,2 @@
+SSH_AGENT_PID	DEFAULT=
+SSH_AUTH_SOCK	DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"