diff --git a/gnupg-agent-wrapper.sh b/gnupg-agent-wrapper.sh
index ed3f429..5457860 100755
--- a/gnupg-agent-wrapper.sh
+++ b/gnupg-agent-wrapper.sh
@@ -2,6 +2,8 @@
 
 [ -n "${GNUPGHOME-}" ] || GNUPGHOME="$HOME/.gnupg"
 INFO="$GNUPGHOME/.gpg-agent-info"
+[ -n "$XDG_RUNTIME_DIR" ] && INFO="$XDG_RUNTIME_DIR/gpg-agent-info"
+
 >>"$INFO"
 enable -f /usr/lib/bash/lockf lockf
 builtin lockf "$INFO"
diff --git a/gnupg-agent.sh b/gnupg-agent.sh
index a210ec4..50ef479 100755
--- a/gnupg-agent.sh
+++ b/gnupg-agent.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 [ -n "${GNUPGHOME-}" ] || GNUPGHOME="$HOME/.gnupg"
+INFO="$GNUPGHOME/.gpg-agent-info"
+[ -n "$XDG_RUNTIME_DIR" ] && INFO="$XDG_RUNTIME_DIR/gpg-agent-info"
 
 if [ -d "$GNUPGHOME" ]; then
 	if [ -r "$GNUPGHOME/gpg.conf" ]; then
@@ -11,7 +13,7 @@ if [ -d "$GNUPGHOME" ]; then
 
 	if grep -qs '^[[:space:]]*use-agent' "$CFG" &&
 	   @LIBEXECDIR@/gnupg/gnupg-agent-wrapper; then
-		. "$GNUPGHOME/.gpg-agent-info"
+		. "$INFO"
 		GPG_TTY="$(tty)"; export GPG_TTY
 	fi