diff --git a/openssh.changes b/openssh.changes
index 3e2689e..41b7854 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  8 10:12:40 UTC 2014 - werner@suse.de
+
+- Ensure that ssh can use the ssh support of the gpg-agent (boo#899647)
+
 -------------------------------------------------------------------
 Mon Jul 21 15:58:09 UTC 2014 - p.drouand@gmail.com
 
diff --git a/ssh-askpass b/ssh-askpass
index 5d8616e..e76e836 100644
--- a/ssh-askpass
+++ b/ssh-askpass
@@ -24,6 +24,13 @@ if [ -z "$SESSION" ] ; then
   fi
 fi
 
+if [ -n "$SSH_AUTH_SOCK" ] ; then
+  # Ensure that ssh can use the ssh support of the gpg-agent 
+  case "$SSH_AUTH_SOCK" in
+  */S.gpg-agent.ssh) gpg-connect-agent /bye < /dev/null ;;
+  esac
+fi
+
 GNOME_SSH_ASKPASS="@LIBEXECDIR@/ssh/gnome-ssh-askpass"
 KDE_SSH_ASKPASS="@LIBEXECDIR@/ssh/ksshaskpass"
 X11_SSH_ASKPASS="@LIBEXECDIR@/ssh/x11-ssh-askpass"