diff --git a/weave b/weave
index 8aa8c713..5bcf1b29 100755
--- a/weave
+++ b/weave
@@ -33,14 +33,14 @@ usage() {
     echo "weave launch-proxy [-D <docker_endpoint>] [-H <address>] [--with-dns] [--with-ipam]"
     echo "weave connect      [--replace] [<peer> ...]"
     echo "weave forget       <peer> ..."
-    echo "weave run          [--with-dns] [[--subnet] <cidr> ...] <docker run args> ..."
-    echo "weave start        [[--subnet] <cidr> ...] <container_id>"
-    echo "weave attach       [[--subnet] <cidr> ...] <container_id>"
-    echo "weave detach       [[--subnet] <cidr> ...] <container_id>"
+    echo "weave run          [--with-dns] [<address_spec> ...] <docker run args> ..."
+    echo "weave start        [<address_spec> ...] <container_id>"
+    echo "weave attach       [<address_spec> ...] <container_id>"
+    echo "weave detach       [<address_spec> ...] <container_id>"
     echo "weave dns-add      <ip_address> [<ip_address> ...] <container_id> [-h <fqdn>]"
     echo "weave dns-remove   <ip_address> [<ip_address> ...] <container_id> [-h <fqdn>]"
-    echo "weave expose       [[--subnet] <cidr> ...] [-h <fqdn>]"
-    echo "weave hide         [[--subnet] <cidr> ...]"
+    echo "weave expose       [<address_spec> ...] [-h <fqdn>]"
+    echo "weave hide         [<address_spec> ...]"
     echo "weave ps           [<container_id> ...]"
     echo "weave status"
     echo "weave proxy-env"
@@ -52,9 +52,10 @@ usage() {
     echo "weave reset"
     echo "weave rmpeer       <peer_id>"
     echo
-    echo "where <peer>    = <ip_address_or_fqdn>[:<port>]"
-    echo "      <cidr>    = <ip_address>/<routing_prefix_length>"
-    echo "      <peer_id> = <nickname> or weave internal peer ID"
+    echo "where <peer>         = <ip_address_or_fqdn>[:<port>]"
+    echo "      <cidr>         = <ip_address>/<routing_prefix_length>"
+    echo "      <peer_id>      = <nickname> or weave internal peer ID"
+    echo "      <address_spec> = <cidr> | --subnet <cidr> | --subnet default"
     echo "      <address> = [tcp://][<ip_address>]:<port>"
     exit 1
 }