2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d323f69e..2fc1f12a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,10 @@
    jchadima at redhat.
  - (djm) [contrib/redhat/openssh.spec contrib/redhat/sshd.init]
    [contrib/suse/openssh.spec contrib/suse/rc.sshd] Updated RHEL and SLES
-   init scrips from imorgan AT nas.nasa.gov
+   init scrips from imorgan AT nas.nasa.gov; bz#1920
+ - (djm) [contrib/ssh-copy-id] Fix failure for cases where the path to the
+   identify file contained whitespace. bz#1828 patch from gwenael.lambrouin
+   AT gmail.com; ok dtucker@
 
 20110807
  - (dtucker) OpenBSD CVS Sync
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 368645cb4..eca7cf520 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -25,7 +25,7 @@ else
 fi
 
 if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
-  GET_ID="cat ${ID_FILE}"
+  GET_ID="cat "${ID_FILE}\""
 fi
 
 if [ -z "`eval $GET_ID`" ]; then