diff --git a/.bashrc b/.bashrc
index 12a7704..6d762ea 100644
--- a/.bashrc
+++ b/.bashrc
@@ -78,3 +78,11 @@ fi
 
 # Misc utilities
 fliptable() { echo "（╯°□°）╯ ┻━┻"; }
+
+# GPG Agent
+if [ -f "${HOME}/.gpg-agent-info" ]; then
+    . "${HOME}/.gpg-agent-info"
+    export GPG_AGENT_INFO
+    export SSH_AUTH_SOCK
+fi
+export GPG_TTY=$(tty)
diff --git a/.xinitrc b/.xinitrc
index bef0813..3dcbea9 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -7,6 +7,7 @@ case "$1" in
 	[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
 	xcompmgr &
 	/usr/bin/xscreensaver -no-splash &
+	eval $(/usr/bin/gpg-agent --daemon --enable-ssh-support --write-env-file "${HOME}/.gpg-agent-info")
 	exec awesome
 	;;
     weston|weston-launch)