diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 81d8680cd9..2a75cf9102 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,39 @@ Community General Release Notes
 
 This changelog describes changes after version 1.0.0.
 
+v2.5.2
+======
+
+Release Summary
+---------------
+
+Regular bugfix release.
+
+Bugfixes
+--------
+
+- composer - use ``no-interaction`` option when discovering available options to avoid an issue where composer hangs (https://github.com/ansible-collections/community.general/pull/2348).
+- hiera lookup plugin - converts the return type of plugin to unicode string (https://github.com/ansible-collections/community.general/pull/2329).
+- influxdb_retention_policy - ensure idempotent module execution with different duration and shard duration parameter values (https://github.com/ansible-collections/community.general/issues/2281).
+- influxdb_retention_policy - fix bug where ``INF`` duration values failed parsing (https://github.com/ansible-collections/community.general/pull/2385).
+- inventory and vault scripts - change file permissions to make vendored inventory and vault scripts exectuable (https://github.com/ansible-collections/community.general/pull/2337).
+- jenkins_plugin - fixes Python 2 compatibility issue (https://github.com/ansible-collections/community.general/pull/2340).
+- jira - fixed error when loading base64-encoded content as attachment (https://github.com/ansible-collections/community.general/pull/2349).
+- linode_v4 - changed the error message to point to the correct bugtracker URL (https://github.com/ansible-collections/community.general/pull/2430).
+- nmap inventory plugin - fix cache and constructed group support (https://github.com/ansible-collections/community.general/issues/2242).
+- nmcli - compare MAC addresses case insensitively to fix idempotency issue (https://github.com/ansible-collections/community.general/issues/2409).
+- nmcli - if type is ``bridge-slave`` add ``slave-type bridge`` to ``nmcli`` command (https://github.com/ansible-collections/community.general/issues/2408).
+- one_vm - Allow missing NIC keys (https://github.com/ansible-collections/community.general/pull/2435).
+- ovirt* modules - remove bad unnecessary import for current ansible-core development version (https://github.com/ansible-collections/community.general/pull/2381).
+- proxmox inventory - added handling of commas in KVM agent configuration string (https://github.com/ansible-collections/community.general/pull/2245).
+- puppet - replace ``console` with ``stdout`` in ``logdest`` option when ``all`` has been chosen (https://github.com/ansible-collections/community.general/issues/1190).
+- stackpath_compute inventory script - fix broken validation checks for client ID and client secret (https://github.com/ansible-collections/community.general/pull/2448).
+- svr4pkg - convert string to a bytes-like object to avoid ``TypeError`` with Python 3 (https://github.com/ansible-collections/community.general/issues/2373).
+- terraform - fix issue that cause the destroy to fail because from Terraform 0.15 on, the ``terraform destroy -force`` option is replaced with ``terraform destroy -auto-approve`` (https://github.com/ansible-collections/community.general/issues/2247).
+- terraform - fix issue that cause the execution fail because from Terraform 0.15 on, the ``-var`` and ``-var-file`` options are no longer available on ``terraform validate`` (https://github.com/ansible-collections/community.general/pull/2246).
+- terraform - remove uses of ``use_unsafe_shell=True`` (https://github.com/ansible-collections/community.general/pull/2246).
+- zfs - certain ZFS properties, especially sizes, would lead to a task being falsely marked as "changed" even when no actual change was made (https://github.com/ansible-collections/community.general/issues/975, https://github.com/ansible-collections/community.general/pull/2454).
+
 v2.5.1
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 38de937216..abead4890e 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1816,3 +1816,69 @@ releases:
     - 2236-jira-isinstance.yml
     - allow_funcd_to_load.yml
     release_date: '2021-04-14'
+  2.5.2:
+    changes:
+      bugfixes:
+      - composer - use ``no-interaction`` option when discovering available options
+        to avoid an issue where composer hangs (https://github.com/ansible-collections/community.general/pull/2348).
+      - hiera lookup plugin - converts the return type of plugin to unicode string
+        (https://github.com/ansible-collections/community.general/pull/2329).
+      - influxdb_retention_policy - ensure idempotent module execution with different
+        duration and shard duration parameter values (https://github.com/ansible-collections/community.general/issues/2281).
+      - influxdb_retention_policy - fix bug where ``INF`` duration values failed parsing
+        (https://github.com/ansible-collections/community.general/pull/2385).
+      - inventory and vault scripts - change file permissions to make vendored inventory
+        and vault scripts exectuable (https://github.com/ansible-collections/community.general/pull/2337).
+      - jenkins_plugin - fixes Python 2 compatibility issue (https://github.com/ansible-collections/community.general/pull/2340).
+      - jira - fixed error when loading base64-encoded content as attachment (https://github.com/ansible-collections/community.general/pull/2349).
+      - linode_v4 - changed the error message to point to the correct bugtracker URL
+        (https://github.com/ansible-collections/community.general/pull/2430).
+      - nmap inventory plugin - fix cache and constructed group support (https://github.com/ansible-collections/community.general/issues/2242).
+      - nmcli - compare MAC addresses case insensitively to fix idempotency issue
+        (https://github.com/ansible-collections/community.general/issues/2409).
+      - nmcli - if type is ``bridge-slave`` add ``slave-type bridge`` to ``nmcli``
+        command (https://github.com/ansible-collections/community.general/issues/2408).
+      - one_vm - Allow missing NIC keys (https://github.com/ansible-collections/community.general/pull/2435).
+      - ovirt* modules - remove bad unnecessary import for current ansible-core development
+        version (https://github.com/ansible-collections/community.general/pull/2381).
+      - proxmox inventory - added handling of commas in KVM agent configuration string
+        (https://github.com/ansible-collections/community.general/pull/2245).
+      - puppet - replace ``console` with ``stdout`` in ``logdest`` option when ``all``
+        has been chosen (https://github.com/ansible-collections/community.general/issues/1190).
+      - stackpath_compute inventory script - fix broken validation checks for client
+        ID and client secret (https://github.com/ansible-collections/community.general/pull/2448).
+      - svr4pkg - convert string to a bytes-like object to avoid ``TypeError`` with
+        Python 3 (https://github.com/ansible-collections/community.general/issues/2373).
+      - terraform - fix issue that cause the destroy to fail because from Terraform
+        0.15 on, the ``terraform destroy -force`` option is replaced with ``terraform
+        destroy -auto-approve`` (https://github.com/ansible-collections/community.general/issues/2247).
+      - terraform - fix issue that cause the execution fail because from Terraform
+        0.15 on, the ``-var`` and ``-var-file`` options are no longer available on
+        ``terraform validate`` (https://github.com/ansible-collections/community.general/pull/2246).
+      - terraform - remove uses of ``use_unsafe_shell=True`` (https://github.com/ansible-collections/community.general/pull/2246).
+      - zfs - certain ZFS properties, especially sizes, would lead to a task being
+        falsely marked as "changed" even when no actual change was made (https://github.com/ansible-collections/community.general/issues/975,
+        https://github.com/ansible-collections/community.general/pull/2454).
+      release_summary: Regular bugfix release.
+    fragments:
+    - 2.5.2.yml
+    - 2245-proxmox_fix_agent_string_handling.yml
+    - 2246-terraform.yaml
+    - 2282-nmap-fix-cache-support.yml
+    - 2284-influxdb_retention_policy-fix_duration_parsing.yml
+    - 2284-influxdb_retention_policy-idempotence.yml
+    - 2329-hiera-lookup-plugin-return-type.yaml
+    - 2337-mark-inventory-scripts-executable.yml
+    - 2340-jenkins_plugin-py2.yml
+    - 2348-composer-no-interaction-option-discovery-to-avoid-hang.yaml
+    - 2349-jira-bugfix-b64decode.yml
+    - 2373-svr4pkg-fix-typeerror.yml
+    - 2407-puppet-change_stdout_to_console.yaml
+    - 2409-nmcli_add_slave-type_bridge_to_nmcli_command_if_type_is_bridge-slave.yml
+    - 2416-nmcli_compare_mac_addresses_case_insensitively.yml
+    - 2430-linodev4-error-message.yml
+    - 2435-one_vm-fix_missing_keys.yml
+    - 2448-stackpath_compute-fix.yml
+    - 2454-detect_zfs_changed.yml
+    - ovirt-fixup.yml
+    release_date: '2021-05-11'
diff --git a/changelogs/fragments/2.5.2.yml b/changelogs/fragments/2.5.2.yml
deleted file mode 100644
index 1b14bd80d1..0000000000
--- a/changelogs/fragments/2.5.2.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular bugfix release.
diff --git a/changelogs/fragments/2245-proxmox_fix_agent_string_handling.yml b/changelogs/fragments/2245-proxmox_fix_agent_string_handling.yml
deleted file mode 100644
index 3eae94f4ea..0000000000
--- a/changelogs/fragments/2245-proxmox_fix_agent_string_handling.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-bugfixes:
-  - proxmox inventory - added handling of commas in KVM agent configuration string (https://github.com/ansible-collections/community.general/pull/2245).
diff --git a/changelogs/fragments/2246-terraform.yaml b/changelogs/fragments/2246-terraform.yaml
deleted file mode 100644
index d2dd93e22e..0000000000
--- a/changelogs/fragments/2246-terraform.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-bugfixes:
-  - terraform - fix issue that cause the execution fail because from Terraform 0.15 on, the ``-var`` and ``-var-file`` options are no longer available on ``terraform validate`` (https://github.com/ansible-collections/community.general/pull/2246).
-  - terraform - fix issue that cause the destroy to fail because from Terraform 0.15 on, the ``terraform destroy -force`` option is replaced with ``terraform destroy -auto-approve`` (https://github.com/ansible-collections/community.general/issues/2247).
-  - terraform - remove uses of ``use_unsafe_shell=True`` (https://github.com/ansible-collections/community.general/pull/2246).
diff --git a/changelogs/fragments/2282-nmap-fix-cache-support.yml b/changelogs/fragments/2282-nmap-fix-cache-support.yml
deleted file mode 100644
index 62b026eb25..0000000000
--- a/changelogs/fragments/2282-nmap-fix-cache-support.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - nmap inventory plugin - fix cache and constructed group support (https://github.com/ansible-collections/community.general/issues/2242).
diff --git a/changelogs/fragments/2284-influxdb_retention_policy-fix_duration_parsing.yml b/changelogs/fragments/2284-influxdb_retention_policy-fix_duration_parsing.yml
deleted file mode 100644
index 04c82480c1..0000000000
--- a/changelogs/fragments/2284-influxdb_retention_policy-fix_duration_parsing.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bugfixes:
-  - influxdb_retention_policy - fix bug where ``INF`` duration values failed parsing
-    (https://github.com/ansible-collections/community.general/pull/2385).
diff --git a/changelogs/fragments/2284-influxdb_retention_policy-idempotence.yml b/changelogs/fragments/2284-influxdb_retention_policy-idempotence.yml
deleted file mode 100644
index 0df25ca462..0000000000
--- a/changelogs/fragments/2284-influxdb_retention_policy-idempotence.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-bugfixes:
-  - influxdb_retention_policy - ensure idempotent module execution with different
-    duration and shard duration parameter values
-    (https://github.com/ansible-collections/community.general/issues/2281).
diff --git a/changelogs/fragments/2329-hiera-lookup-plugin-return-type.yaml b/changelogs/fragments/2329-hiera-lookup-plugin-return-type.yaml
deleted file mode 100644
index 4cced727a2..0000000000
--- a/changelogs/fragments/2329-hiera-lookup-plugin-return-type.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - hiera lookup plugin - converts the return type of plugin to unicode string (https://github.com/ansible-collections/community.general/pull/2329).
diff --git a/changelogs/fragments/2337-mark-inventory-scripts-executable.yml b/changelogs/fragments/2337-mark-inventory-scripts-executable.yml
deleted file mode 100644
index 69aa3fff62..0000000000
--- a/changelogs/fragments/2337-mark-inventory-scripts-executable.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-bugfixes:
-  - inventory and vault scripts - change file permissions to make vendored inventory and vault scripts exectuable (https://github.com/ansible-collections/community.general/pull/2337).
diff --git a/changelogs/fragments/2340-jenkins_plugin-py2.yml b/changelogs/fragments/2340-jenkins_plugin-py2.yml
deleted file mode 100644
index f3bcdbd361..0000000000
--- a/changelogs/fragments/2340-jenkins_plugin-py2.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-- "jenkins_plugin - fixes Python 2 compatibility issue (https://github.com/ansible-collections/community.general/pull/2340)."
\ No newline at end of file
diff --git a/changelogs/fragments/2348-composer-no-interaction-option-discovery-to-avoid-hang.yaml b/changelogs/fragments/2348-composer-no-interaction-option-discovery-to-avoid-hang.yaml
deleted file mode 100644
index 0728aeb28b..0000000000
--- a/changelogs/fragments/2348-composer-no-interaction-option-discovery-to-avoid-hang.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - composer - use ``no-interaction`` option when discovering available options to avoid an issue where composer hangs (https://github.com/ansible-collections/community.general/pull/2348).
diff --git a/changelogs/fragments/2349-jira-bugfix-b64decode.yml b/changelogs/fragments/2349-jira-bugfix-b64decode.yml
deleted file mode 100644
index 41a1dabb94..0000000000
--- a/changelogs/fragments/2349-jira-bugfix-b64decode.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - jira - fixed error when loading base64-encoded content as attachment (https://github.com/ansible-collections/community.general/pull/2349).
diff --git a/changelogs/fragments/2373-svr4pkg-fix-typeerror.yml b/changelogs/fragments/2373-svr4pkg-fix-typeerror.yml
deleted file mode 100644
index d0b3580889..0000000000
--- a/changelogs/fragments/2373-svr4pkg-fix-typeerror.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-bugfixes:
-  - svr4pkg - convert string to a bytes-like object to avoid ``TypeError`` with Python 3 (https://github.com/ansible-collections/community.general/issues/2373).
diff --git a/changelogs/fragments/2407-puppet-change_stdout_to_console.yaml b/changelogs/fragments/2407-puppet-change_stdout_to_console.yaml
deleted file mode 100644
index 697b8e78d7..0000000000
--- a/changelogs/fragments/2407-puppet-change_stdout_to_console.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-bugfixes:
-  - puppet - replace ``console` with ``stdout`` in ``logdest`` option when ``all`` has been chosen (https://github.com/ansible-collections/community.general/issues/1190).
diff --git a/changelogs/fragments/2409-nmcli_add_slave-type_bridge_to_nmcli_command_if_type_is_bridge-slave.yml b/changelogs/fragments/2409-nmcli_add_slave-type_bridge_to_nmcli_command_if_type_is_bridge-slave.yml
deleted file mode 100644
index 8d0b4c1617..0000000000
--- a/changelogs/fragments/2409-nmcli_add_slave-type_bridge_to_nmcli_command_if_type_is_bridge-slave.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - nmcli - if type is ``bridge-slave`` add ``slave-type bridge`` to ``nmcli`` command (https://github.com/ansible-collections/community.general/issues/2408).
diff --git a/changelogs/fragments/2416-nmcli_compare_mac_addresses_case_insensitively.yml b/changelogs/fragments/2416-nmcli_compare_mac_addresses_case_insensitively.yml
deleted file mode 100644
index 6694638964..0000000000
--- a/changelogs/fragments/2416-nmcli_compare_mac_addresses_case_insensitively.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - nmcli - compare MAC addresses case insensitively to fix idempotency issue (https://github.com/ansible-collections/community.general/issues/2409).
diff --git a/changelogs/fragments/2430-linodev4-error-message.yml b/changelogs/fragments/2430-linodev4-error-message.yml
deleted file mode 100644
index 3dbfda1b9c..0000000000
--- a/changelogs/fragments/2430-linodev4-error-message.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - linode_v4 - changed the error message to point to the correct bugtracker URL (https://github.com/ansible-collections/community.general/pull/2430).
diff --git a/changelogs/fragments/2435-one_vm-fix_missing_keys.yml b/changelogs/fragments/2435-one_vm-fix_missing_keys.yml
deleted file mode 100644
index 395c024b26..0000000000
--- a/changelogs/fragments/2435-one_vm-fix_missing_keys.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - one_vm - Allow missing NIC keys (https://github.com/ansible-collections/community.general/pull/2435).
diff --git a/changelogs/fragments/2448-stackpath_compute-fix.yml b/changelogs/fragments/2448-stackpath_compute-fix.yml
deleted file mode 100644
index 196db780b1..0000000000
--- a/changelogs/fragments/2448-stackpath_compute-fix.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-- "stackpath_compute inventory script - fix broken validation checks for client ID and client secret (https://github.com/ansible-collections/community.general/pull/2448)."
diff --git a/changelogs/fragments/2454-detect_zfs_changed.yml b/changelogs/fragments/2454-detect_zfs_changed.yml
deleted file mode 100644
index 0604278f6b..0000000000
--- a/changelogs/fragments/2454-detect_zfs_changed.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - zfs - certain ZFS properties, especially sizes, would lead to a task being falsely marked as "changed" even when no actual change was made (https://github.com/ansible-collections/community.general/issues/975, https://github.com/ansible-collections/community.general/pull/2454).
diff --git a/changelogs/fragments/ovirt-fixup.yml b/changelogs/fragments/ovirt-fixup.yml
deleted file mode 100644
index 073a4cfbe8..0000000000
--- a/changelogs/fragments/ovirt-fixup.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-- "ovirt* modules - remove bad unnecessary import for current ansible-core development version (https://github.com/ansible-collections/community.general/pull/2381)."