diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f8dd2fa678..f9538c247a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,34 @@ Community General Release Notes
This changelog describes changes after version 4.0.0.
+v5.0.1
+======
+
+Release Summary
+---------------
+
+Regular bugfix release for inclusion in Ansible 6.0.0.
+
+Minor Changes
+-------------
+
+- cpanm - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
+- mksysb - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
+- pipx - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
+- snap - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
+- xfconf - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
+
+Bugfixes
+--------
+
+- consul - fixed bug introduced in PR 4590 (https://github.com/ansible-collections/community.general/issues/4680).
+- filesystem - handle ``fatresize --info`` output lines without ``:`` (https://github.com/ansible-collections/community.general/pull/4700).
+- filesystem - improve error messages when output cannot be parsed by including newlines in escaped form (https://github.com/ansible-collections/community.general/pull/4700).
+- keycloak_realm - fix default groups and roles (https://github.com/ansible-collections/community.general/issues/4241).
+- redis* modules - fix call to ``module.fail_json`` when failing because of missing Python libraries (https://github.com/ansible-collections/community.general/pull/4733).
+- xcc_redfish_command - for compatibility due to Redfish spec changes the virtualMedia resource location changed from Manager to System (https://github.com/ansible-collections/community.general/pull/4682).
+- zfs - fix wrong quoting of properties (https://github.com/ansible-collections/community.general/issues/4707, https://github.com/ansible-collections/community.general/pull/4726).
+
v5.0.0
======
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 93848ff41e..5cef13733e 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -755,3 +755,39 @@ releases:
name: counter
namespace: null
release_date: '2022-04-29'
+ 5.0.1:
+ changes:
+ bugfixes:
+ - consul - fixed bug introduced in PR 4590 (https://github.com/ansible-collections/community.general/issues/4680).
+ - filesystem - handle ``fatresize --info`` output lines without ``:`` (https://github.com/ansible-collections/community.general/pull/4700).
+ - filesystem - improve error messages when output cannot be parsed by including
+ newlines in escaped form (https://github.com/ansible-collections/community.general/pull/4700).
+ - keycloak_realm - fix default groups and roles (https://github.com/ansible-collections/community.general/issues/4241).
+ - redis* modules - fix call to ``module.fail_json`` when failing because of
+ missing Python libraries (https://github.com/ansible-collections/community.general/pull/4733).
+ - xcc_redfish_command - for compatibility due to Redfish spec changes the virtualMedia
+ resource location changed from Manager to System (https://github.com/ansible-collections/community.general/pull/4682).
+ - zfs - fix wrong quoting of properties (https://github.com/ansible-collections/community.general/issues/4707,
+ https://github.com/ansible-collections/community.general/pull/4726).
+ minor_changes:
+ - cpanm - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived
+ modules (https://github.com/ansible-collections/community.general/pull/4674).
+ - mksysb - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived
+ modules (https://github.com/ansible-collections/community.general/pull/4674).
+ - pipx - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived
+ modules (https://github.com/ansible-collections/community.general/pull/4674).
+ - snap - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived
+ modules (https://github.com/ansible-collections/community.general/pull/4674).
+ - xfconf - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived
+ modules (https://github.com/ansible-collections/community.general/pull/4674).
+ release_summary: Regular bugfix release for inclusion in Ansible 6.0.0.
+ fragments:
+ - 4674-use-mh-raise.yaml
+ - 4682-compatibility-virtualmedia-resource-location.yaml
+ - 4700-code-changes.yml
+ - 4712-consul-bugfix.yaml
+ - 4719-fix-keycloak-realm.yaml
+ - 4726-zfs.yml
+ - 4733-redis-fail.yml
+ - 5.0.1.yml
+ release_date: '2022-05-30'
diff --git a/changelogs/fragments/4674-use-mh-raise.yaml b/changelogs/fragments/4674-use-mh-raise.yaml
deleted file mode 100644
index 3e8ad13975..0000000000
--- a/changelogs/fragments/4674-use-mh-raise.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-minor_changes:
- - cpanm - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
- - pipx - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
- - snap - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
- - mksysb - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
- - xfconf - using ``do_raise()`` to raise exceptions in ``ModuleHelper`` derived modules (https://github.com/ansible-collections/community.general/pull/4674).
diff --git a/changelogs/fragments/4682-compatibility-virtualmedia-resource-location.yaml b/changelogs/fragments/4682-compatibility-virtualmedia-resource-location.yaml
deleted file mode 100644
index c15ee4d15c..0000000000
--- a/changelogs/fragments/4682-compatibility-virtualmedia-resource-location.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
- - xcc_redfish_command - for compatibility due to Redfish spec changes the virtualMedia resource location changed from Manager to System (https://github.com/ansible-collections/community.general/pull/4682).
\ No newline at end of file
diff --git a/changelogs/fragments/4700-code-changes.yml b/changelogs/fragments/4700-code-changes.yml
deleted file mode 100644
index d1b281d876..0000000000
--- a/changelogs/fragments/4700-code-changes.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bugfixes:
- - "filesystem - improve error messages when output cannot be parsed by including newlines in escaped form (https://github.com/ansible-collections/community.general/pull/4700)."
- - "filesystem - handle ``fatresize --info`` output lines without ``:`` (https://github.com/ansible-collections/community.general/pull/4700)."
diff --git a/changelogs/fragments/4712-consul-bugfix.yaml b/changelogs/fragments/4712-consul-bugfix.yaml
deleted file mode 100644
index bc63999b11..0000000000
--- a/changelogs/fragments/4712-consul-bugfix.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
- - consul - fixed bug introduced in PR 4590 (https://github.com/ansible-collections/community.general/issues/4680).
diff --git a/changelogs/fragments/4719-fix-keycloak-realm.yaml b/changelogs/fragments/4719-fix-keycloak-realm.yaml
deleted file mode 100644
index 3071756ec5..0000000000
--- a/changelogs/fragments/4719-fix-keycloak-realm.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
- - "keycloak_realm - fix default groups and roles (https://github.com/ansible-collections/community.general/issues/4241)."
\ No newline at end of file
diff --git a/changelogs/fragments/4726-zfs.yml b/changelogs/fragments/4726-zfs.yml
deleted file mode 100644
index c785e2ba11..0000000000
--- a/changelogs/fragments/4726-zfs.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
- - "zfs - fix wrong quoting of properties (https://github.com/ansible-collections/community.general/issues/4707, https://github.com/ansible-collections/community.general/pull/4726)."
diff --git a/changelogs/fragments/4733-redis-fail.yml b/changelogs/fragments/4733-redis-fail.yml
deleted file mode 100644
index f8a6e14d9a..0000000000
--- a/changelogs/fragments/4733-redis-fail.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
- - "redis* modules - fix call to ``module.fail_json`` when failing because of missing Python libraries (https://github.com/ansible-collections/community.general/pull/4733)."
diff --git a/changelogs/fragments/5.0.1.yml b/changelogs/fragments/5.0.1.yml
deleted file mode 100644
index 88759d331d..0000000000
--- a/changelogs/fragments/5.0.1.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular bugfix release for inclusion in Ansible 6.0.0.