diff --git a/couchdb/README.md b/couchdb/README.md
index 30cde2429..437268e19 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -66,6 +66,14 @@ You can map the container's volumes to a directory on the host, so that the data
 $ docker run -d -v $(pwd):/usr/local/var/lib/couchdb --name my-couchdb couchdb
 ```
 
+## Specifying the admin user in the environment
+
+You can use the two environment variables `COUCHDB_USER` and `COUCHDB_PASSWORD` to set up the admin user.
+
+```console
+$ docker run -e COUCHDB_USER=admin -e COUCHDB_PASSWORD=password -d couchdb
+```
+
 ## Using your own CouchDB configuration file
 
 The CouchDB configuration is specified in `.ini` files in `/usr/local/etc/couchdb`. Take a look at the [CouchDB configuration documentation](http://docs.couchdb.org/en/1.6.1/config/index.html) to learn more about CouchDBs configuration structure.
@@ -104,6 +112,10 @@ For example in `local.ini`:
 file = /usr/local/var/log/couchdb/couch.log
 ```
 
+## Erlang Version
+
+This image uses Erlang `17.3` from Debian Jessie's repository. Debian's version patches a critical bug in Erlang `17.3` and is good to use with CouchDB ([confirmed by Jan Lehnardt](https://github.com/klaemo/docker-couchdb/issues/50#issuecomment-190832786)).
+
 # License
 
 Apache CouchDB is licensed under the [Apache License](https://github.com/apache/couchdb/blob/master/LICENSE).
diff --git a/nats/README.md b/nats/README.md
index f52d4eaaa..b58e3c961 100644
--- a/nats/README.md
+++ b/nats/README.md
@@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links
 
--	[`0.7.2`, `latest` (*Dockerfile*)](https://github.com/nats-io/nats-docker/blob/1b4a8d5b0e99f3983a71d54ddb70cecc1e8228a1/Dockerfile)
+-	[`0.8.0`, `latest` (*Dockerfile*)](https://github.com/nats-io/nats-docker/blob/4d4b57f1ffdcf1be9c90de445e1862ce3e974eb7/Dockerfile)
 
-[![](https://badge.imagelayers.io/nats:latest.svg)](https://imagelayers.io/?images=nats:0.7.2)
+[![](https://badge.imagelayers.io/nats:latest.svg)](https://imagelayers.io/?images=nats:0.8.0)
 
 For more information about this image and its history, please see [the relevant manifest file (`library/nats`)](https://github.com/docker-library/official-images/blob/master/library/nats). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fnats).