diff --git a/CHANGELOG.md b/CHANGELOG.md
index d421811b0..6880dd0b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. This projec
 
 ### Changed
 
+- [#1408](https://github.com/luyadev/luya/issues/1408) CMS Module removed bootstrap process inside module, use Bootstrap class instead.
 - [#1414](https://github.com/luyadev/luya/issues/1414) Renamed Angular Helper methods, removed all the zaa prefixes.
 - [#1308](https://github.com/luyadev/luya/issues/1308) Renamed `luya\admin\ngrest\plugins\CheckboxRelation::labelFields` to `luya\admin\ngrest\plugins\CheckboxRelation::labelField`
 - [#1301](https://github.com/luyadev/luya/issues/1301) Move the CRUD commands to the admin module `admin/crud/create` and `admin/crud/model`.
diff --git a/UPGRADE.md b/UPGRADE.md
index 1a03f804c..f36fc43f4 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -6,6 +6,7 @@ This document will help you upgrading from a LUYA Version into another. For more
 1.0.0-RC4 (in progress)
 -------------------
 
+- [#1408](https://github.com/luyadev/luya/issues/1408) THe CMS Module is now bootstraped over the luya composer plugin if you want explicit call the bootstrap process use `'bootstrap' => ['luya\cms\frontend\Bootstrap']` inside your config.
 + [#1414](https://github.com/luyadev/luya/issues/1414) Renamed Angular Helper methods, removed all the zaa prefixes.
 + [#1369](https://github.com/luyadev/luya/issues/1369) FlowActiveWindow dropped property `$modelClass` and does need to be configured anymore.