diff -Nru gnupg2-2.0.26/debian/changelog gnupg2-2.0.26/debian/changelog
--- gnupg2-2.0.26/debian/changelog	2015-03-11 12:25:44.000000000 +0000
+++ gnupg2-2.0.26/debian/changelog	2015-05-05 12:09:38.000000000 +0000
@@ -1,3 +1,15 @@
+gnupg2 (2.0.26-6ubuntu2) wily; urgency=medium
+
+  [ Mark Adams ]
+  * Updated debian/gpg-agent.user-session.upstart so that global environment
+    variables SSH_AUTH_SOCK and SSH_AGENT_PID are set if gpg-agent is running
+    with SSH support. LP: #1407513
+
+  [ Iain Lane ]
+  * Fix whitespace in user session job.
+
+ -- Mark Adams <mark@markadams.me>  Tue, 05 May 2015 13:09:36 +0100
+
 gnupg2 (2.0.26-6ubuntu1) vivid; urgency=medium
 
   * Merge from Debian, remaining changes:
diff -Nru gnupg2-2.0.26/debian/gpg-agent.user-session.upstart gnupg2-2.0.26/debian/gpg-agent.user-session.upstart
--- gnupg2-2.0.26/debian/gpg-agent.user-session.upstart	2015-03-11 12:25:12.000000000 +0000
+++ gnupg2-2.0.26/debian/gpg-agent.user-session.upstart	2015-05-05 12:09:13.000000000 +0000
@@ -10,13 +10,26 @@
 
     grep -qs '^[[:space:]]*use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" || { stop; exit 0; }
 
-
     eval "$(gpg-agent --daemon --sh)" >/dev/null
     initctl set-env --global GPG_AGENT_INFO=$GPG_AGENT_INFO
+
+    grep -qs "^enable-ssh-support$" "$GNUPGHOME/gpg-agent.conf"
+
+    if [ $? -eq 0 ]; then
+        initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK
+        initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID
+    fi
 end script
 
 post-stop script
     GPG_AGENT_PID=$(echo $GPG_AGENT_INFO | cut -d : -f2)
     kill $GPG_AGENT_PID 2>/dev/null || true
     initctl unset-env --global GPG_AGENT_INFO
+
+    grep -qs "^enable-ssh-support$" "$GNUPGHOME/gpg-agent.conf"
+
+    if [ $? -eq 0 ]; then
+        initctl unset-env --global SSH_AUTH_SOCK
+        initctl unset-env --global SSH_AGENT_PID
+    fi
 end script