diff --git a/nats/README.md b/nats/README.md
index dcbdb4104..616adb2e9 100644
--- a/nats/README.md
+++ b/nats/README.md
@@ -16,9 +16,9 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`0.9.6`, `latest` (*Dockerfile*)](https://github.com/nats-io/nats-docker/blob/24da6ab2af9e849f6a96e32ed2efcb7c0799ab13/Dockerfile)
--	[`0.9.6-nanoserver`, `nanoserver` (*windows/nanoserver/Dockerfile*)](https://github.com/nats-io/nats-docker/blob/24da6ab2af9e849f6a96e32ed2efcb7c0799ab13/windows/nanoserver/Dockerfile)
--	[`0.9.6-windowsservercore`, `windowsservercore` (*windows/windowsservercore/Dockerfile*)](https://github.com/nats-io/nats-docker/blob/24da6ab2af9e849f6a96e32ed2efcb7c0799ab13/windows/windowsservercore/Dockerfile)
+-	[`1.0.0`, `latest` (*Dockerfile*)](https://github.com/nats-io/nats-docker/blob/90d28dc0964ba4f4b811cf21d593496939bf7990/Dockerfile)
+-	[`1.0.0-nanoserver`, `nanoserver` (*windows/nanoserver/Dockerfile*)](https://github.com/nats-io/nats-docker/blob/90d28dc0964ba4f4b811cf21d593496939bf7990/windows/nanoserver/Dockerfile)
+-	[`1.0.0-windowsservercore`, `windowsservercore` (*windows/windowsservercore/Dockerfile*)](https://github.com/nats-io/nats-docker/blob/90d28dc0964ba4f4b811cf21d593496939bf7990/windows/windowsservercore/Dockerfile)
 
 # Quick reference
 
@@ -62,7 +62,7 @@ WARNING:
 # use -p or -P as needed.
 
 $ docker run -d --name nats-main nats
-[INF] Starting nats-server version 0.9.6
+[INF] Starting nats-server version 1.0.0
 [INF] Starting http monitor on 0.0.0.0:8222
 [INF] Listening for client connections on 0.0.0.0:4222
 [INF] Server is ready
@@ -71,21 +71,24 @@ $ docker run -d --name nats-main nats
 ...
 
 # To run a second server and cluster them together..
-$ docker run -d --name=nats-2 --link nats-main nats --routes=nats-route://ruser:T0pS3cr3t@nats-main:6222
+# Note that since you are passing arguments, this overrides the CMD section
+# of the Dockerfile, so you need to pass all arguments, including the
+# config file.
+$ docker run -d --name=nats-2 --link nats-main nats -c gnatsd.conf --routes=nats-route://ruser:T0pS3cr3t@nats-main:6222
 
-# If you want to verify the routes are connected, try
-$ docker run -d --name=nats-2 --link nats-main nats --routes=nats-route://ruser:T0pS3cr3t@nats-main:6222 -DV
-[INF] Starting nats-server version 0.9.6
-[DBG] Go build version go1.6.3
+# If you want to verify the routes are connected, try this instead:
+$ docker run -d --name=nats-2 --link nats-main nats -c gnatsd.conf --routes=nats-route://ruser:T0pS3cr3t@nats-main:6222 -DV
+[INF] Starting nats-server version 1.0.0
+[DBG] Go build version go1.7.6
 [INF] Starting http monitor on 0.0.0.0:8222
 [INF] Listening for client connections on 0.0.0.0:4222
-[DBG] Server id is HQLO4vvXi434nlqWjbTbec
+[DBG] Server id is BEfslG6VOmnIbMQcXTVaVJ
 [INF] Server is ready
 [INF] Listening for route connections on 0.0.0.0:6222
 [DBG] Trying to connect to route on nats-main:6222
 [DBG] 172.17.0.2:6222 - rid:1 - Route connection created
 [DBG] 172.17.0.2:6222 - rid:1 - Route connect msg sent
-[DBG] 172.17.0.2:6222 - rid:1 - Registering remote route "PRJPXBdDnqK5ATfyQ7Jjlv"
+[DBG] 172.17.0.2:6222 - rid:1 - Registering remote route "vay01L4cPxqy75GIDcqKq7"
 [DBG] 172.17.0.2:6222 - rid:1 - Route sent local subscriptions
 ```
 
@@ -131,11 +134,12 @@ Server Options:
     -m, --http_port <port>           Use port for http monitoring
     -ms,--https_port <port>          Use port for https monitoring
     -c, --config <file>              Configuration file
+    -sl,--signal <signal>[=<pid>]    Send signal to gnatsd process (stop, quit, reopen, reload)
 
 Logging Options:
     -l, --log <file>                 File to redirect log output
     -T, --logtime                    Timestamp log entries (default: true)
-    -s, --syslog                     Enable syslog as log method
+    -s, --syslog                     Log to syslog or windows event log
     -r, --remote_syslog <addr>       Syslog server addr (udp://localhost:514)
     -D, --debug                      Enable debugging output
     -V, --trace                      Trace the raw protocol
@@ -157,6 +161,7 @@ Cluster Options:
         --routes <rurl-1, rurl-2>    Routes to solicit and connect
         --cluster <cluster-url>      Cluster URL for solicited routes
         --no_advertise <bool>        Advertise known cluster IPs to clients
+        --connect_retries <number>   For implicit routes, number of connect retries
 
 
 Common Options:
diff --git a/spiped/README.md b/spiped/README.md
index 4c1d044ab..55d0ffa3b 100644
--- a/spiped/README.md
+++ b/spiped/README.md
@@ -16,7 +16,7 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`1.6.0`, `1.6`, `1`, `latest` (*1.6/Dockerfile*)](https://github.com/TimWolla/docker-spiped/blob/c9dfc2d06685a700788f85d833875de31e0f2538/1.6/Dockerfile)
+-	[`1.6.0`, `1.6`, `1`, `latest` (*1.6/Dockerfile*)](https://github.com/TimWolla/docker-spiped/blob/4d45a684a91cd50c98a79fbcabc479efe0b49dde/1.6/Dockerfile)
 -	[`1.6.0-alpine`, `1.6-alpine`, `1-alpine`, `alpine` (*1.6/alpine/Dockerfile*)](https://github.com/TimWolla/docker-spiped/blob/c9dfc2d06685a700788f85d833875de31e0f2538/1.6/alpine/Dockerfile)
 
 # Quick reference