diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb23d751ba7b8fb610ad64fc025ae8315fa9cd2d..e4ac6386b09bc9ab311f1f85c30017b15061f4be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 - [fail2ban](./plugins/inputs/fail2ban/README.md)
 - [minecraft](./plugins/inputs/minecraft/README.md)
+- [fluentd](./plugins/inputs/fluentd/README.md)
 
 ### Features
 
@@ -37,6 +38,7 @@
 - [#2963](https://github.com/influxdata/telegraf/pull/2963): Add support for RethinkDB 1.0 handshake protocol.
 - [#2943](https://github.com/influxdata/telegraf/pull/2943): Add optional usage_active and time_active CPU metrics.
 - [#2973](https://github.com/influxdata/telegraf/pull/2973): Change default prometheus_client port.
+- [#2661](https://github.com/influxdata/telegraf/pull/2661): Add fluentd input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index aca0b7c86dba2e281457900d18d2403cec10576c..476d80dec1faad1ed2cd13c20586b31bfd04121b 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@ configuration options.
 * [exec](./plugins/inputs/exec) (generic executable plugin, support JSON, influx, graphite and nagios)
 * [fail2ban](./plugins/inputs/fail2ban)
 * [filestat](./plugins/inputs/filestat)
+* [fluentd](./plugins/inputs/fluentd)
 * [graylog](./plugins/inputs/graylog)
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)