diff --git a/.bashrc b/.bashrc
index d12d501..c006fce 100644
--- a/.bashrc
+++ b/.bashrc
@@ -22,3 +22,7 @@ unset DIR
 if [ -f /etc/bashrc ]; then
     source /etc/bashrc
 fi
+
+# As suggested by gpg-agent manual, ensure the tty always matches
+GPG_TTY=$(tty)
+export GPG_TTY