diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b0139d0d62..6a2d6d4adf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,24 @@ Community General Release Notes
 
 This changelog describes changes after version 4.0.0.
 
+v5.8.8
+======
+
+Release Summary
+---------------
+
+Regular bugfix release.
+
+Bugfixes
+--------
+
+- archive - reduce RAM usage by generating CRC32 checksum over chunks (https://github.com/ansible-collections/community.general/pull/6274).
+- flatpak - fixes idempotency detection issues. In some cases the module could fail to properly detect already existing Flatpaks because of a parameter witch only checks the installed apps (https://github.com/ansible-collections/community.general/pull/6289).
+- icinga2_host - fix the data structure sent to Icinga to make use of host templates and template vars (https://github.com/ansible-collections/community.general/pull/6286).
+- idrac_redfish_command - allow user to specify ``resource_id`` for ``CreateBiosConfigJob`` to specify an exact manager (https://github.com/ansible-collections/community.general/issues/2090).
+- ini_file - make ``section`` parameter not required so it is possible to pass ``null`` as a value. This only was possible in the past due to a bug in ansible-core that now has been fixed (https://github.com/ansible-collections/community.general/pull/6404).
+- rhsm_release - make ``release`` parameter not required so it is possible to pass ``null`` as a value. This only was possible in the past due to a bug in ansible-core that now has been fixed (https://github.com/ansible-collections/community.general/pull/6401).
+
 v5.8.7
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 7b92332c01..456a554b44 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1561,3 +1561,30 @@ releases:
     - 6180-replace-deprecated-badzipfile.yml
     - 6227-xen-orchestra-check-response-id.yml
     release_date: '2023-03-27'
+  5.8.8:
+    changes:
+      bugfixes:
+      - archive - reduce RAM usage by generating CRC32 checksum over chunks (https://github.com/ansible-collections/community.general/pull/6274).
+      - flatpak - fixes idempotency detection issues. In some cases the module could
+        fail to properly detect already existing Flatpaks because of a parameter witch
+        only checks the installed apps (https://github.com/ansible-collections/community.general/pull/6289).
+      - icinga2_host - fix the data structure sent to Icinga to make use of host templates
+        and template vars (https://github.com/ansible-collections/community.general/pull/6286).
+      - idrac_redfish_command - allow user to specify ``resource_id`` for ``CreateBiosConfigJob``
+        to specify an exact manager (https://github.com/ansible-collections/community.general/issues/2090).
+      - ini_file - make ``section`` parameter not required so it is possible to pass
+        ``null`` as a value. This only was possible in the past due to a bug in ansible-core
+        that now has been fixed (https://github.com/ansible-collections/community.general/pull/6404).
+      - rhsm_release - make ``release`` parameter not required so it is possible to
+        pass ``null`` as a value. This only was possible in the past due to a bug
+        in ansible-core that now has been fixed (https://github.com/ansible-collections/community.general/pull/6401).
+      release_summary: Regular bugfix release.
+    fragments:
+    - 2090-idrac-redfish-resource-id-fix.yml
+    - 5.8.8.yml
+    - 6199-archive-generate-checksum-in-chunks.yml
+    - 6286-icinga2_host-template-and-template-vars.yml
+    - 6289-bugfix-flatpak-check-if-already-installed.yml
+    - 6401-rhsm_release-required.yml
+    - 6404-ini_file-section.yml
+    release_date: '2023-04-24'
diff --git a/changelogs/fragments/2090-idrac-redfish-resource-id-fix.yml b/changelogs/fragments/2090-idrac-redfish-resource-id-fix.yml
deleted file mode 100644
index e386cb1416..0000000000
--- a/changelogs/fragments/2090-idrac-redfish-resource-id-fix.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-    - idrac_redfish_command - allow user to specify ``resource_id`` for ``CreateBiosConfigJob`` to specify an exact manager (https://github.com/ansible-collections/community.general/issues/2090).
diff --git a/changelogs/fragments/5.8.8.yml b/changelogs/fragments/5.8.8.yml
deleted file mode 100644
index 3c57f0388e..0000000000
--- a/changelogs/fragments/5.8.8.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular bugfix release.
\ No newline at end of file
diff --git a/changelogs/fragments/6199-archive-generate-checksum-in-chunks.yml b/changelogs/fragments/6199-archive-generate-checksum-in-chunks.yml
deleted file mode 100644
index ed0a1e2dca..0000000000
--- a/changelogs/fragments/6199-archive-generate-checksum-in-chunks.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - archive - reduce RAM usage by generating CRC32 checksum over chunks (https://github.com/ansible-collections/community.general/pull/6274).
diff --git a/changelogs/fragments/6286-icinga2_host-template-and-template-vars.yml b/changelogs/fragments/6286-icinga2_host-template-and-template-vars.yml
deleted file mode 100644
index 7ddeea37f7..0000000000
--- a/changelogs/fragments/6286-icinga2_host-template-and-template-vars.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "icinga2_host - fix the data structure sent to Icinga to make use of host templates and template vars (https://github.com/ansible-collections/community.general/pull/6286)."
diff --git a/changelogs/fragments/6289-bugfix-flatpak-check-if-already-installed.yml b/changelogs/fragments/6289-bugfix-flatpak-check-if-already-installed.yml
deleted file mode 100644
index e331250035..0000000000
--- a/changelogs/fragments/6289-bugfix-flatpak-check-if-already-installed.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - flatpak - fixes idempotency detection issues. In some cases the module could fail to properly detect already existing Flatpaks because of a parameter witch only checks the installed apps (https://github.com/ansible-collections/community.general/pull/6289).
diff --git a/changelogs/fragments/6401-rhsm_release-required.yml b/changelogs/fragments/6401-rhsm_release-required.yml
deleted file mode 100644
index bf47fa8237..0000000000
--- a/changelogs/fragments/6401-rhsm_release-required.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "rhsm_release - make ``release`` parameter not required so it is possible to pass ``null`` as a value. This only was possible in the past due to a bug in ansible-core that now has been fixed (https://github.com/ansible-collections/community.general/pull/6401)."
diff --git a/changelogs/fragments/6404-ini_file-section.yml b/changelogs/fragments/6404-ini_file-section.yml
deleted file mode 100644
index b9e8a10e76..0000000000
--- a/changelogs/fragments/6404-ini_file-section.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "ini_file - make ``section`` parameter not required so it is possible to pass ``null`` as a value. This only was possible in the past due to a bug in ansible-core that now has been fixed (https://github.com/ansible-collections/community.general/pull/6404)."