diff --git a/zlogin b/zlogin
index 876e24c..ad432dc 100644
--- a/zlogin
+++ b/zlogin
@@ -86,8 +86,10 @@ if [ -f $HOME/.ssh/id_rsa ]; then
   . $HOME/.keychain/$HOST-sh
 fi
 
-# Launch Keychain for GPG
-#[ -f $HOME/.keychain/$HOST-sh-gpg ] && \
-  #keychain --agents gpg
-  #. $HOME/.keychain/$HOST-sh-gpg
+# GPG Agent
+if [ -f $HOME/.gnupg/secring.gpg ]; then
+  # Keychain
+  keychain --noask --systemd --agents gpg
+  . $HOME/.keychain/$HOST-sh-gpg
+fi