diff --git a/CHANGELOG-6.4.md b/CHANGELOG-6.4.md
new file mode 100644
index 0000000000..9bfec757ef
--- /dev/null
+++ b/CHANGELOG-6.4.md
@@ -0,0 +1,29 @@
+CHANGELOG for 6.4.x
+===================
+
+This changelog references the relevant changes (bug and security fixes) done in 6.4 minor versions.
+
+To get the diff for a specific change, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/commit/XXX where XXX is the change hash
+To get the diff between two versions, go to https://github.com/kunstmaan/KunstmaanBundlesCMS/compare/6.4.0...6.4.1
+
+## 6.4.0-alpha1 / 2024-03-24
+
+* [NodeBundle] Fix php8 deprecation in ExternalUrlValidator [#3361](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3361) ([@acrobat](https://github.com/acrobat))
+* [AllBundles] Various phpdoc return type fixes [#3360](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3360) ([@acrobat](https://github.com/acrobat))
+* [AllBundles] Fix return type deprecations and add missing return types [#3357](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3357) ([@acrobat](https://github.com/acrobat))
+* [AllBundles] Fix gedmo sibblings deprecation [#3356](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3356) ([@acrobat](https://github.com/acrobat))
+* [AllBundles] Fix issues with adminlist configurator deprecations [#3354](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3354) ([@acrobat](https://github.com/acrobat))
+* [AdminList] Fix AdminLists [#3352](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3352) ([@dannyvw](https://github.com/dannyvw))
+* [FormBundle] Remove empty_data from ChoiceFormSubmissionType [#3349](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3349) ([@dannyvw](https://github.com/dannyvw))
+* [AdminListBundle] Deprecate configurator getBundleName/getEntityName methods [#3347](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3347) ([@acrobat](https://github.com/acrobat))
+* [AdminBundle] Add extra blocks to authentication layout [#3342](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3342) ([@dannyvw](https://github.com/dannyvw))
+* [MediaBundle] - allow custom view vars in chooser [#3337](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3337) ([@delboy1978uk](https://github.com/delboy1978uk))
+* [NodeBundle] View parent nodes from list [#3334](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3334) ([@dannyvw](https://github.com/dannyvw))
+* [AdminBundle] Add hide sidebar configuration [#3333](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3333) ([@dannyvw](https://github.com/dannyvw))
+* [SearchBundle, NodeSearchBundle] : change `nGram` to `ngram` [#3331](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3331) ([@delboy1978uk](https://github.com/delboy1978uk))
+* [DashboardBundle] Fix controller route attribute resolver in DashboardWidget [#3325](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3325) ([@acrobat](https://github.com/acrobat))
+* [AllBundles] Switch Route and Validator annotations to attributes [#3323](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3323) ([@acrobat](https://github.com/acrobat))
+* [FormBundle] Fix draft version form page [#3304](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3304) ([@dannyvw](https://github.com/dannyvw))
+* [RedirectBundle] Add order by to redirect admin list [#3300](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3300) ([@dannyvw](https://github.com/dannyvw))
+* [PagePartBundle] Allow deleting nested sub-entities [#3292](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3292) ([@acrobat](https://github.com/acrobat))
+* [AllBundle] Add compatibility for new PUBLIC_ACCESS role [#3120](https://github.com/Kunstmaan/KunstmaanBundlesCMS/pull/3120) ([@acrobat](https://github.com/acrobat)) 
diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
new file mode 100644
index 0000000000..39cde266a3
--- /dev/null
+++ b/UPGRADE-6.4.md
@@ -0,0 +1,7 @@
+UPGRADE FROM 6.3 to 6.4
+========================
+
+AdminListBundle
+-----------
+
+- The methods `getBundleName` and `getEntityName` of `Kunstmaan\AdminListBundle\AdminList\Configurator\AbstractAdminListConfigurator` are deprecated. Implement the `getEntityClass` method instead.