1 files changed, 6 insertions, 1 deletions
diff --git a/xinitrc b/xinitrc
index d672077..83aff98 100755
--- a/xinitrc
+++ b/xinitrc
@@ -100,7 +100,12 @@ fi
 # {{{ Autostart settings
 #
 # Start the GnuPG agent and enable the OpenSSH agent emulation
-eval "$(/usr/bin/killall gpg-agent; /usr/bin/gpg-agent --enable-ssh-support --daemon)"
+if ( /bin/pidof gpg-agent >/dev/null ); then
+    eval "$(cat $HOME/.gnupg/gpg-agent-info)"
+    eval "$(cut -d= -f 1 < $HOME/.gnupg/gpg-agent-info | xargs echo export)"
+else
+    eval "$(gpg-agent --enable-ssh-support --daemon)"
+fi
 
 # Play a startup sound
 #/usr/bin/ogg123 -q $HOME/.fvwm/sounds/Startup.ogg &