2 files changed, 9 insertions, 2 deletions

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 65c0a8cd8..2f757de4b 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -38,10 +38,10 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
   exit 1
 fi
 
-{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
+{ eval "$GET_ID" ; } | ssh ${1%:} "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
 
 cat <<EOF
-Now try logging into the machine, with "ssh '$1'", and check in:
+Now try logging into the machine, with "ssh '${1%:}'", and check in:
 
   .ssh/authorized_keys
 
diff --git a/debian/changelog b/debian/changelog
index df26dea13..fef4a2ce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:5.1p1-4) UNRELEASED; urgency=low
+
+  * ssh-copy-id: Strip trailing colons from hostname (closes: #226172,
+    LP: #249706; thanks to Karl Goetz for nudging this along).
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 09 Oct 2008 12:52:34 +0100
+
 openssh (1:5.1p1-3) unstable; urgency=low
 
   * Remove unnecessary ssh-vulnkey output in non-verbose mode when no