diff --git a/.github_changelog_generator b/.github_changelog_generator
index 6663fe6..12f81ac 100644
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1 +1,3 @@
-issues=no
+issues=yes
+unreleased=yes
+future-release=2.0.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff4bcdf..ae2f193 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,37 @@
 # Changelog
 
+## [2.0.0](https://github.com/sbitio/puppet-monit/tree/2.0.0) (2020-01-15)
+
+[Full Changelog](https://github.com/sbitio/puppet-monit/compare/1.1.0...2.0.0)
+
+**Closed issues:**
+
+- Deprecate hiera\_merge\_strategy [\#42](https://github.com/sbitio/puppet-monit/issues/42)
+- Check all filesystems by default \(not only /\) [\#41](https://github.com/sbitio/puppet-monit/issues/41)
+- Upgrade module to support Puppet4 [\#35](https://github.com/sbitio/puppet-monit/issues/35)
+- Make IP address parameter optional [\#33](https://github.com/sbitio/puppet-monit/issues/33)
+- Wrong permissions for monitrc [\#32](https://github.com/sbitio/puppet-monit/issues/32)
+- Concat requirements [\#29](https://github.com/sbitio/puppet-monit/issues/29)
+- permissions of monitrc on Debian 9.1 - monit    1:5.20.0-6   [\#28](https://github.com/sbitio/puppet-monit/issues/28)
+
+**Merged pull requests:**
+
+- Add support for EXIST check [\#39](https://github.com/sbitio/puppet-monit/pull/39) ([NITEMAN](https://github.com/NITEMAN))
+- Added FreeBSD support [\#38](https://github.com/sbitio/puppet-monit/pull/38) ([jurgenweber](https://github.com/jurgenweber))
+- Make bind IP address optional. [\#31](https://github.com/sbitio/puppet-monit/pull/31) ([wdec](https://github.com/wdec))
+
 ## [1.1.0](https://github.com/sbitio/puppet-monit/tree/1.1.0) (2017-08-21)
 
 [Full Changelog](https://github.com/sbitio/puppet-monit/compare/1.0.0...1.1.0)
 
+**Closed issues:**
+
+- On cetons missing repo epel [\#26](https://github.com/sbitio/puppet-monit/issues/26)
+- Checking error in host.pp [\#22](https://github.com/sbitio/puppet-monit/issues/22)
+- monit won't start on Debian Squeeze [\#14](https://github.com/sbitio/puppet-monit/issues/14)
+- Puppet 4 and puppetserver setup \> add puppetlabs-concat to fix this dependency issue [\#12](https://github.com/sbitio/puppet-monit/issues/12)
+- template vars are missing scope [\#11](https://github.com/sbitio/puppet-monit/issues/11)
+
 **Merged pull requests:**
 
 - Add example for Centos 7 [\#27](https://github.com/sbitio/puppet-monit/pull/27) ([nvtkaszpir](https://github.com/nvtkaszpir))
@@ -28,6 +56,10 @@
 
 [Full Changelog](https://github.com/sbitio/puppet-monit/compare/0.3.1...0.3.2)
 
+**Closed issues:**
+
+- Systemd file paths differs on Debian and Redhat/Centos \(regresion introduced in 4ff388c\) [\#6](https://github.com/sbitio/puppet-monit/issues/6)
+
 **Merged pull requests:**
 
 - Fix \#6. Systemd file paths differs on Debian and Redhat/Centos [\#7](https://github.com/sbitio/puppet-monit/pull/7) ([NITEMAN](https://github.com/NITEMAN))
@@ -40,6 +72,13 @@
 
 [Full Changelog](https://github.com/sbitio/puppet-monit/compare/0.2.1...0.3.0)
 
+**Closed issues:**
+
+- Add support for MATCHING in services \(when no PID available\) [\#4](https://github.com/sbitio/puppet-monit/issues/4)
+- Add "default" support for CentOS 7 \(systemd instead of initd\) [\#3](https://github.com/sbitio/puppet-monit/issues/3)
+- Improve quality score [\#2](https://github.com/sbitio/puppet-monit/issues/2)
+- monit\_validate\_tests.rb: warning: already initialized constant  [\#1](https://github.com/sbitio/puppet-monit/issues/1)
+
 **Merged pull requests:**
 
 - Update monit\_validate\_tests.rb [\#5](https://github.com/sbitio/puppet-monit/pull/5) ([MNiedzielski](https://github.com/MNiedzielski))
diff --git a/README.md b/README.md
index 1372924..bffc96d 100644
--- a/README.md
+++ b/README.md
@@ -311,9 +311,10 @@ See Puppet Strings doc at [doc/index.html](https://github.com/sbitio/puppet-moni
 
 This module requires Puppet 4.x, and is compatible with the following OSes/versions:
 
- * Debian 7, 8
- * RedHat/CentOS 7,8
- * Ubuntu 12.04, 14.04
+ * FreeBSD
+ * Debian 7, 8, 9
+ * RedHat/CentOS 7, 8
+ * Ubuntu 12.04, 14.04, 16.04
 
 For Puppet 3 or older versions of Debian, please use 1.x.x releases.
 
diff --git a/metadata.json b/metadata.json
index c2428b8..4d9179d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "sbitio-monit",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "author": "SB IT Media, S.L.",
   "summary": "Performs installation and configuration of Monit service, along with fine grained definition of checks",
   "license": "MIT",
@@ -13,10 +13,11 @@
     {"name":"puppetlabs/concat","version_requirement":">= 1.2.1 < 6.0.0"}
   ],
   "operatingsystem_support": [
+    {"operatingsystem": "FreeBSD"},
     {"operatingsystem": "CentOS","operatingsystemrelease":["6","7"]},
-    {"operatingsystem": "Debian","operatingsystemrelease":["7","8"]},
+    {"operatingsystem": "Debian","operatingsystemrelease":["7","8","9"]},
     {"operatingsystem": "Redhat","operatingsystemrelease":["6","7"]},
-    {"operatingsystem": "Ubuntu","operatingsystemrelease":["12.04","14.04"]}
+    {"operatingsystem": "Ubuntu","operatingsystemrelease":["12.04","14.04","16.04"]}
   ],
   "requirements": [
     {"name": "puppet", "version_requirement": ">= 4.0.0 < 5.0.0"}