diff --git a/CHANGELOG.md b/CHANGELOG.md
index 460e20e..20806a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,31 @@
-  - context_timeout now accepts Fixnum as well as String
-* 2014-08-12 2.1.0 Separate Rulesets, Rules and Actions
-  - rules accept the `order` parameter which controls the order
-    of appearance in the merged parser file
-  - rulesets, rules and actions can now be declared separately
-    this pulls in the puppetlabs-concat dependancy
-  - allow rules and patterns to be strings
-    that will be coerced to single-element arrays
-    this will make it easier to use this module with puppetdb
-    https://tickets.puppetlabs.com/browse/PDB-170
-  - treat action/message/inherit_properties as a real boolean
-* 2014-06-16 2.0.0 Support multiple merged patterndb files
-  - added support for multiple pattern databases
-  - class `patterndb::update` replaced by define `patterndb::parser`
-  - moved parameters from `update` to base class
-* 2014-06-10 1.0.0 Initial release
+## 2015-08-26 2.2.0
+
+* context_timeout now accepts Fixnum as well as String
+* add parameter order for ruleset
+* Drop support for puppet 2.x
+
+## 2015-08-26 2.1.1 UNRELEASED
+
+* escape special chars in generated xml
+* Allow empty patterns in rulesets
+* context_timeout and version now accept Fixnum as well as String
+
+## 2014-08-12 2.1.0 Separate Rulesets, Rules and Actions
+
+* rules accept the `order` parameter which controls the order
+  of appearance in the merged parser file
+* rulesets, rules and actions can now be declared separately
+  this pulls in the puppetlabs-concat dependancy
+* allow rules and patterns to be strings
+  that will be coerced to single-element arrays
+  this will make it easier to use this module with puppetdb
+  https://tickets.puppetlabs.com/browse/PDB-170
+* treat action/message/inherit_properties as a real boolean
+
+## 2014-06-16 2.0.0 Support multiple merged patterndb files
+
+* added support for multiple pattern databases
+* class `patterndb::update` replaced by define `patterndb::parser`
+* moved parameters from `update` to base class
+
+## 2014-06-10 1.0.0 Initial release
diff --git a/metadata.json b/metadata.json
index ee48042..937ed6d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "ccin2p3-patterndb",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "author": "ccin2p3",
   "summary": "Puppet module for patterndb (Syslog-ng)",
   "license": "CeCILL B",