--- /etc/xdg/xfce4/xinitrc	2009-10-17 10:00:47.000000000 -0400
+++ /etc/xdg/xfce4/xinitrc	2009-10-17 10:08:49.000000000 -0400
@@ -117,6 +117,14 @@
 	kill_sshagent=1
 fi
 
+# Use gpg-agent if installed and not already running.
+gpgagent=`which gpg-agent`
+kill_gpgagent=0
+if [ -x $gpgagent ]; then
+	eval "$($gpgagent --daemon)"
+	kill_gpgagent=1
+fi
+
 # Use dbus-launch if installed.
 if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
 	dbuslaunch=`which dbus-launch`
@@ -136,6 +144,9 @@
 		if test $kill_sshagent -eq 1; then
 			eval `$sshagent -k`
 		fi
+		if test $kill_gpgagent -eq 1; then
+			kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+		fi
 		exit 0
 		;;
 esac
@@ -226,4 +237,8 @@
 	eval `$sshagent -k`
 fi
 
+if test $kill_gpgagent -eq 1; then
+	kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+fi
+
 xsetroot -bg white -fg red  -solid black -cursor_name watch