diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3e0626d8..836745df6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,12 @@ It is highly recommended that all users migrate to the new riemann output plugin
 - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int.
 - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection.
 
+## v1.2.1 [unreleased]
+
+### Bugfixes
+
+- [#2317](https://github.com/influxdata/telegraf/issues/2317): Fix segfault on nil metrics with influxdb output.
+
 ## v1.2 [2017-01-00]
 
 ### Release Notes