diff --git a/ChangeLog b/ChangeLog
index ad5b66a78..00c74c3e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20130605
- - (dtucker) Enable sha256 kex methods based on the presence of the necessary
-   functions, not from the openssl version.
+ - (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of
+   the necessary functions, not from the openssl version.
+ - (dtucker) [contrib/ssh-copy-id] bz#2117: Use portable operator in test.
+   Patch from cjwatson at debian.
 
 20130602
  - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 9f2817b6b..ae88e9958 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -165,7 +165,7 @@ done
 
 eval set -- "$SAVEARGS"
 
-if [ $# == 0 ] ; then
+if [ $# = 0 ] ; then
   usage
 fi
 if [ $# != 1 ] ; then