diff --git a/zsh.changes b/zsh.changes
index 47c0bb1..e0c67bf 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Tue May  5 04:41:08 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 
-- Add back LS_COLORS and LS_OPTIONS 
+- Add back LS_COLORS, LS_OPTIONS and GPG_TTY
 
 -------------------------------------------------------------------
 Wed Apr 15 09:02:14 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
diff --git a/zshrc b/zshrc
index d3c7b01..a273b55 100644
--- a/zshrc
+++ b/zshrc
@@ -283,7 +283,6 @@ fi
 
 # ls color option depends on the terminal
 # If LS_COLORS is set but empty, the terminal has no colors.
-#
 if test "${LS_COLORS+empty}" = "${LS_COLORS:+empty}" ; then
     LS_OPTIONS=--color=tty
 else
@@ -296,13 +295,18 @@ else
     LS_OPTIONS="-N $LS_OPTIONS -T 0"
 fi
 
-#
 # Avoid trouble with Emacs shell mode
-#
 if test "$EMACS" = "t" ; then
     LS_OPTIONS='-N --color=none -T 0';
 fi
 export LS_OPTIONS
 
+# Set GPG_TTY for curses pinentry
+# (see man gpg-agent and bnc#619295)
+if test -t && type -p tty > /dev/null 2>&1 ; then
+    GPG_TTY="`tty`"
+    export GPG_TTY
+fi
+
 # Read custom system-wide config if exists
 test -s /etc/zsh.zshrc.local && . /etc/zsh.zshrc.local