diff --git a/CHANGELOG.md b/CHANGELOG.md
index 782787d7a..82c4db86e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ of metrics collected and from how many plugins.
 - [#287](https://github.com/influxdb/telegraf/issues/287): Batch AMQP output, thanks @ekini!
 - [#301](https://github.com/influxdb/telegraf/issues/301): Collect on even intervals
 - [#298](https://github.com/influxdb/telegraf/pull/298): Support retrying output writes
+- [#300](https://github.com/influxdb/telegraf/issues/300): aerospike plugin. Thanks @oldmantaiter!
 
 ### Bugfixes
 - [#228](https://github.com/influxdb/telegraf/pull/228): New version of package will replace old one. Thanks @ekini!
diff --git a/README.md b/README.md
index d63af6316..5db1dcb07 100644
--- a/README.md
+++ b/README.md
@@ -165,6 +165,7 @@ Below is how to configure `tagpass` and `tagdrop` parameters (added in 0.1.5)
 
 Telegraf currently has support for collecting metrics from:
 
+* aerospike
 * apache
 * bcache
 * disque