diff --git a/CHANGELOG.md b/CHANGELOG.md
index 020a06cfe..adf07b6a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,16 @@
 ## v0.12.1 [unreleased]
 
+### Release Notes
+- Breaking change in the dovecot input plugin. See Features section below.
+
 ### Features
 - [#976](https://github.com/influxdata/telegraf/pull/976): Reduce allocations in the UDP and statsd inputs.
 - [#979](https://github.com/influxdata/telegraf/pull/979): Reduce allocations in the TCP listener.
+- [#992](https://github.com/influxdata/telegraf/pull/992): Refactor allocations in TCP/UDP listeners.
 - [#935](https://github.com/influxdata/telegraf/pull/935): AWS Cloudwatch input plugin. Thanks @joshhardy & @ljosa!
 - [#943](https://github.com/influxdata/telegraf/pull/943): http_response input plugin. Thanks @Lswith!
 - [#939](https://github.com/influxdata/telegraf/pull/939): sysstat input plugin. Thanks @zbindenren!
+- [#998](https://github.com/influxdata/telegraf/pull/998): **breaking change** enabled global, user and ip queries in dovecot plugin. Thanks @mikif70!
 
 ### Bugfixes
 - [#968](https://github.com/influxdata/telegraf/issues/968): Processes plugin gets unknown state when spaces are in (command name)
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index fa77a3a34..92deb2139 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -526,8 +526,11 @@
 #   ##
 #   ## If no servers are specified, then localhost is used as the host.
 #   servers = ["localhost:24242"]
-#   ## Only collect metrics for these domains, collect all if empty
-#   domains = []
+#   ## Type is one of "user", "domain", "ip", or "global"
+#   type = "global"
+#   ## Wildcard matches like "*.com". An empty string "" is same as "*"
+#   ## If type = "ip" filters should be <IP/network>
+#   filters = [""]
 
 
 # # Read stats from one or more Elasticsearch servers or clusters
@@ -671,6 +674,16 @@
 #   [[inputs.jolokia.metrics]]
 #     name = "heap_memory_usage"
 #     jmx  = "/java.lang:type=Memory/HeapMemoryUsage"
+#     
+#   ## This collect thread counts metrics.
+#   [[inputs.jolokia.metrics]]
+#     name = "thread_count"
+#     jmx  = "/java.lang:type=Threading/TotalStartedThreadCount,ThreadCount,DaemonThreadCount,PeakThreadCount"
+#  
+#   ## This collect number of class loaded/unloaded counts metrics.
+#   [[inputs.jolokia.metrics]]
+#     name = "class_count"
+#     jmx  = "/java.lang:type=ClassLoading/LoadedClassCount,UnloadedClassCount,TotalLoadedClassCount"
 
 
 # # Read metrics from a LeoFS Server via SNMP