diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52e00bb5f..5011ec59f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
 ## v0.2.1 [unreleased]
 
 ### Release Notes
+- Telegraf will no longer use docker-compose for "long" unit test, it has been
+changed to just run docker commands in the Makefile. See `make docker-run` and
+`make docker-kill`. `make test` will still run all unit tests with docker.
 
 ### Features
+- [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive!
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 24743736f..2793b4afb 100644
--- a/README.md
+++ b/README.md
@@ -214,6 +214,7 @@ found by running `telegraf -sample-config`.
 ## Supported Outputs
 
 * influxdb
+* nsq
 * kafka
 * datadog
 * opentsdb