3 files changed, 7 insertions, 5 deletions

diff --git a/contrib/Makefile b/contrib/Makefile
index 2cef46f6c..00e96e7b9 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -7,9 +7,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
                 `gnome-config --libs gnome gnomeui`
 
 gnome-ssh-askpass2: gnome-ssh-askpass2.c
-        $(CC) `pkg-config --cflags gtk+-2.0` \
+        $(CC) `pkg-config --cflags gtk+-2.0 x11` \
                 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
-                `pkg-config --libs gtk+-2.0`
+                `pkg-config --libs gtk+-2.0 x11`
 
 clean:
         rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
index 9d97c30c0..04b3a110e 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -209,6 +209,8 @@ main(int argc, char **argv)
 
         gtk_init(&argc, &argv);
 
+        gtk_window_set_default_icon_from_file ("/usr/share/pixmaps/ssh-askpass-gnome.png", NULL);
+
         if (argc > 1) {
                 message = g_strjoinv(" ", argv + 1);
         } else {
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index df74d25c8..2f757de4b 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
@@ -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