diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d475ebac416a1dabdbbae07483bbd74c422f720..41a97ed7b227cf9a0d52c2b1d2854591e4c9169a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### New Plugins
 - [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
 - [jolokia2](./plugins/inputs/jolokia2/README.md) - Thanks to @dylanmei
+- [wavefront](./plugins/inputswavefront/README.md) - Thanks to @puckpuck
 
 ### Release Notes
 
@@ -34,6 +35,7 @@
 - [#2278](https://github.com/influxdata/telegraf/pull/2278): Add redesigned Jolokia input plugin.
 - [#3106](https://github.com/influxdata/telegraf/pull/3106): Add configurable separator for metrics and fields in opentsdb output.
 - [#1692](https://github.com/influxdata/telegraf/pull/1692): Add support for the rollbar occurrence webhook event.
+- [#3160](https://github.com/influxdata/telegraf/pull/3160): Add Wavefront output plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 49c0446f65fc2815fad84576c36acb862df06770..9e7ad03f95701a3ccee9fd85fbfbed8f6dddab11 100644
--- a/README.md
+++ b/README.md
@@ -283,3 +283,4 @@ formats may be used with input plugins supporting the `data_format` option:
 * [socket_writer](./plugins/outputs/socket_writer)
 * [tcp](./plugins/outputs/socket_writer)
 * [udp](./plugins/outputs/socket_writer)
+* [wavefront](./plugins/outputs/wavefront)