diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48976c9..ab6e682 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,49 @@
 # Changelog
+All notable changes to this project will be documented in this file.
 
-All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org).
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## Supported Release 1.1.7
-### Summary
+## [2.0.0] - 2020-11-01
+This is the first release after forking the module. It aims to be compatible
+with spacepants/ds_389, but please read the migration notes in the README.
+
+### Added
+* Add new parameter `$create_suffix`
+* Add ability to manage 389-ds plugins
+* Add migration path for users of spacepants/puppet-ds_389
+* Add acceptance test for multi-master replication
+
+### Changed
+* Drop legacy tool usage (setup-ds.pl)
+* Migrate params.pp to Hiera module data
+* Convert erb templates to epp
+* Refactor SSL setup/config to use new tools wherever possible
+* Refactor support for nsds5replicatedattributelist (`$excluded_attributes`)
+* Refactor support for nsDS5ReplicaPurgeDelay (`$purge_delay`)
+* Use modern facts instead of $::fqdn, $::hostname, etc.
+* Update to PDK 1.18.1
+* Limit OS support to versions that include 389-ds 1.4
+* Update unit tests
+* Update acceptance tests
+
+### Fixed
+* Fix resource ordering: a service restart could break the initialization of the replication
+
+## [1.1.7] - 2018-03-13
 This release fixes an issue when setting the file descriptor limit on Debian systems.
 
 ### Changed
 * Fix limits config dir on Debian.
 
-## Supported Release 1.1.6
+## [1.1.6] - 2018-01-29
 ### Summary
 This release fixes a replication issue for consumers and hubs.
 
 ### Changed
 * Set the replica id for consumers and hubs.
 
-## Supported Release 1.1.5
-### Summary
+## [1.1.5] - 2018-01-19
 This release adds some additional fixes for replication.
 
 ### Changed
@@ -26,31 +51,27 @@ This release adds some additional fixes for replication.
 * Cleaned up replication attributes.
 * Made the replication agreement cn more explicit.
 
-## Supported Release 1.1.4
-### Summary
+## [1.1.4] - 2018-01-18
 Fixed a bug with replication logic.
 
 ### Changed
 * Check for fqdn when setting replication.
 
-## Supported Release 1.1.3
-### Summary
+## [1.1.3] - 2018-01-18
 This release adds additional support for StartTLS. ldapadd and ldapmodify actions now connect via the URI, and can connect with StartTLS via the `starttls` param. nsDS5ReplicaTransportInfo can be set to 'TLS' as well.
 
 ### Changed
 * ldapadd / ldapmodify commands now connect via URI.
 * ldapadd / ldapmodify commands now can connect with StartTLS.
 
-## Supported Release 1.1.2
-### Summary
+## [1.1.2] - 2018-01-12
 This release adds the ability to customize nsDS5ReplicaTransportInfo for replication. It defaults to 'LDAP', but can be set to 'SSL' via the `replica_transport` param.
 
 ### Changed
 * Parameterize replication transport.
 * ldapadd / ldapmodify commands now default to port 389 instead of 636.
 
-## Supported Release 1.1.1
-### Summary
+## [1.1.1] - 2018-01-05
 This release adds the ability to specify the minssf setting that controls StartTLS for non-SSL connections.
 
 ### Changed
@@ -58,8 +79,7 @@ This release adds the ability to specify the minssf setting that controls StartT
 * Default nsslapd-minssf value changed to package default.
 * ldif files are passed to ldapmodify directly instead of piping from stdout.
 
-## Supported Release 1.1.0
-### Summary
+## [1.1.0] - 2017-12-18
 This release adds the ability to manage the content of both `ds_389::add` and `ds_389::modify` ldif files. This allows for better secret management and the use of template(), inline_template(), or inline_epp() when declaring these defined types.
 
 ### Changed
@@ -69,6 +89,16 @@ This release adds the ability to manage the content of both `ds_389::add` and `d
 * Added `replication_user` which defaults to 'Replication Manager'.
 * `bind_dn` is now optional, and allows the bind DN for replication to be overriden if needed.
 
-## Supported Release 1.0.0
-### Summary
+## 1.0.0 - 2017-10-27
 * Initial release.
+
+[Unreleased]: https://github.com/markt-de/puppet-ds_389/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/markt-de/puppet-ds_389/compare/1.1.7...2.0.0
+[1.1.7]: https://github.com/markt-de/puppet-ds_389/compare/1.1.6...1.1.7
+[1.1.6]: https://github.com/markt-de/puppet-ds_389/compare/1.1.5...1.1.6
+[1.1.5]: https://github.com/markt-de/puppet-ds_389/compare/1.1.4...1.1.5
+[1.1.4]: https://github.com/markt-de/puppet-ds_389/compare/1.1.3...1.1.4
+[1.1.3]: https://github.com/markt-de/puppet-ds_389/compare/1.1.2...1.1.3
+[1.1.2]: https://github.com/markt-de/puppet-ds_389/compare/1.1.1...1.1.2
+[1.1.1]: https://github.com/markt-de/puppet-ds_389/compare/1.1.0...1.1.1
+[1.1.0]: https://github.com/markt-de/puppet-ds_389/compare/1.0.0...1.1.0
diff --git a/README.md b/README.md
index 99d1593..551facc 100644
--- a/README.md
+++ b/README.md
@@ -341,7 +341,7 @@ This module requires 389-ds version 1.4 or later. If you rely on older versions
 
 ### Migrating from spacepants module
 
-Version 2.x of this module contains migration tasks for users of [spacepants/puppet-ds_389](https://github.com/spacepants/puppet-ds_389). They will ensure that the replication status of suppliers, hubs and consumers is preserved.
+Version 2.x of this module contains migration tasks for users of [spacepants/puppet-ds_389](https://github.com/spacepants/puppet-ds_389). They will ensure that the SSL status as well as the replication status of suppliers, hubs and consumers is preserved. However, it is strongly recommended to setup a test environment or at least run Puppet Agent with `--noop` when migrating to this module.
 
 ## Development
 
diff --git a/metadata.json b/metadata.json
index b728130..d3db012 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "fraenki-ds_389",
-  "version": "1.1.7",
+  "version": "2.0.0",
   "author": "markt.de",
   "summary": "Module for installing and managing 389 Directory Server",
   "license": "Apache-2.0",