2 files changed, 3 insertions, 1 deletions

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 1555b5d37..84db5db51 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -19,7 +19,7 @@ if [ "-i" = "$1" ]; then
     shift         # and this should leave $1 as the target name
   fi
 else
-  if [ x$SSH_AUTH_SOCK != x ] ; then
+  if [ x$SSH_AUTH_SOCK != x ] && ssh-add -L >/dev/null 2>&1; then
     GET_ID="$GET_ID ssh-add -L"
   fi
 fi
diff --git a/debian/changelog b/debian/changelog
index 63b80dbc5..77a063bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:4.6p1-5) UNRELEASED; urgency=low
 
   * Identify ssh as a metapackage rather than a transitional package. It's
     still useful as a quick way to install both the client and the server.
+  * ssh-copy-id checks the exit status of ssh-add -L (thanks, Adeodato Simó;
+    closes: #221675).
   * debconf template translations:
     - Update Catalan (thanks, Jordà Polo; closes: #431970).