diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19435b098c73e44814de0db05f8eb7344db5d82a..a2d176959c688165f11f1dfeac3580b9e9f0bdff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 ## v1.5 [unreleased]
 
 ### 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
+- [nginx_plus](./plugins/inputs/nginx_plus/README.md) - Thanks to @mplonka & @poblahblahblah
+- [smart](./plugins/inputs/smart/README.md) - Thanks to @rickard-von-essen
+- [wavefront](./plugins/inputs/wavefront/README.md) - Thanks to @puckpuck
 
 ### Release Notes
 
@@ -37,6 +38,7 @@
 - [#3160](https://github.com/influxdata/telegraf/pull/3160): Add Wavefront output plugin.
 - [#3281](https://github.com/influxdata/telegraf/pull/3281): Add extra wired tiger cache metrics to mongodb input.
 - [#3141](https://github.com/influxdata/telegraf/pull/3141): Collect Docker Swarm service metrics in docker input plugin.
+- [#2449](https://github.com/influxdata/telegraf/pull/2449): Add smart input plugin for collecting S.M.A.R.T. data.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 9e7ad03f95701a3ccee9fd85fbfbed8f6dddab11..a3887e56675d5eee0f6ca9f6bbd0b4468e9902c2 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ configuration options.
 * [riak](./plugins/inputs/riak)
 * [salesforce](./plugins/inputs/salesforce)
 * [sensors](./plugins/inputs/sensors)
+* [smart](./plugins/inputs/smart)
 * [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
 * [sql server](./plugins/inputs/sqlserver) (microsoft)