diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc48d94c2..3dcde9817 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,57 @@
+## 2014-12-26 Release 3.1.0
+
+### Backwards-incompatible changes:
+
+There are no known backwards compat changes, please add them to the
+CHANGELOG if you find one.
+
+### Summary:
+
+This release introduces support for 3 new plugins, new parameters for existing
+plugins, bugfixes, doc improvments and basic acceptance tests with beaker.
+
+### New Plugins:
+
+* Add conntrack module
+* Add cpufreq plugin
+* Add collectd::plugin::zfs_arc
+
+### Features:
+
+* filecount: support all options
+* plugin::python introduce ensure parameter
+* Make plugins passing the $interval parameter
+* Support LogSendErrors on the write_graphite plugin
+* curl: fix handling of some parameters
+* curl_json: Support reading from a unix socket
+* Adding support for WriteQueueLimitLow & WriteQueueLimitHigh, which were added in collectd 5.4
+
+### Bugs/Maint:
+
+* Lintian fixes
+* Ensure variable using 'false' will be interpreted.
+* Cleaning the now redundant LoadPlugin declaration
+* Uses the LoadPlugin syntax with bracket when supported
+* Fix Puppet deprecation warning
+* Add "" to Hostname
+* Double quote the csv plugin DataDir.
+* write_http: StoreRates is a bool, not a string
+* curl : 'MeasureResponseTime' needs exactly one boolean argument
+* Add collectd-apache package needed on RedHat
+* Variables in templates should use @-notation
+
+### Tests:
+
+* Basic acceptance test with beaker
+* Add rspec test to ensure the bracket syntax is using when available
+* Fix travis by using plabs gemfile
+
+### Docs:
+
+* Add conntrack to README.md
+* Add cpufreq plugin doc
+* README.md: Fixed example entropy snippet.
+
 ## 2014-10-04 Release 3.0.1
 
 ### Backwards-incompatible changes:
diff --git a/metadata.json b/metadata.json
index 6386c05d8..481fd443d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -71,7 +71,7 @@
     }
   ],
   "name": "pdxcat-collectd",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "source": "https://github.com/pdxcat/puppet-module-collectd",
   "author": "Computer Action Team",
   "license": "Apache Version 2.0",