diff --git a/ChangeLog b/ChangeLog
index 4ac8b2b7..632f1ff6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 fwknop-2.0.4 (11/15/2012):
+    - [client] Misc fixes and the addition of save_args and last command 
+      (.fwknop.last) support on the Windows platform.
+    - [client] Fixed bug in username determination code where a valid value
+      could be overrwritten in certain circumstances.
     - [server] Added upstart config at extras/upstart/fwknop.conf.  This
       allows the fwknopd to easily be managed with upstart via commands like
       "service fwknop start" and "service fwknop stop".
diff --git a/client/config_init.c b/client/config_init.c
index 1f0007b5..cae7c49a 100644
--- a/client/config_init.c
+++ b/client/config_init.c
@@ -967,6 +967,8 @@ usage(void)
       "                             (md5, sha1, or sha256 (default)).\n"
       " -f, --fw-timeout            Specify SPA server firewall timeout from the\n"
       "                             client side.\n"
+      "     --icmp-type             Set the ICMP type (used with '-P icmp')\n"
+      "     --icmp-code             Set the ICMP code (used with '-P icmp')\n"
       "     --gpg-encryption        Use GPG encryption (default is Rijndael).\n"
       "     --gpg-recipient-key     Specify the recipient GPG key name or ID.\n"
       "     --gpg-signer-key        Specify the signer's GPG key name or ID.\n"