diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8153d4d0de..d79e485090 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,20 @@ Community General Release Notes
 
 This changelog describes changes after version 3.0.0.
 
+v4.0.1
+======
+
+Release Summary
+---------------
+
+Bugfix release for today's Ansible 5.0.0 beta 1.
+
+Bugfixes
+--------
+
+- a_module test plugin - fix crash when testing a module name that was tombstoned (https://github.com/ansible-collections/community.general/pull/3660).
+- xattr - fix exception caused by ``_run_xattr()`` raising a ``ValueError`` due to a mishandling of base64-encoded value (https://github.com/ansible-collections/community.general/issues/3673).
+
 v4.0.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 91f37caeab..c4f37f4008 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1027,3 +1027,16 @@ releases:
         name: a_module
         namespace: null
     release_date: '2021-11-02'
+  4.0.1:
+    changes:
+      bugfixes:
+      - a_module test plugin - fix crash when testing a module name that was tombstoned
+        (https://github.com/ansible-collections/community.general/pull/3660).
+      - xattr - fix exception caused by ``_run_xattr()`` raising a ``ValueError``
+        due to a mishandling of base64-encoded value (https://github.com/ansible-collections/community.general/issues/3673).
+      release_summary: Bugfix release for today's Ansible 5.0.0 beta 1.
+    fragments:
+    - 3660-a_module-tombstone.yml
+    - 3675-xattr-handle-base64-values.yml
+    - 4.0.1.yml
+    release_date: '2021-11-09'
diff --git a/changelogs/fragments/3660-a_module-tombstone.yml b/changelogs/fragments/3660-a_module-tombstone.yml
deleted file mode 100644
index d2408d4a26..0000000000
--- a/changelogs/fragments/3660-a_module-tombstone.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "a_module test plugin - fix crash when testing a module name that was tombstoned (https://github.com/ansible-collections/community.general/pull/3660)."
diff --git a/changelogs/fragments/3675-xattr-handle-base64-values.yml b/changelogs/fragments/3675-xattr-handle-base64-values.yml
deleted file mode 100644
index e74a2afedd..0000000000
--- a/changelogs/fragments/3675-xattr-handle-base64-values.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bugfixes:
-  - xattr - fix exception caused by ``_run_xattr()`` raising a ``ValueError``
-    due to a mishandling of base64-encoded value (https://github.com/ansible-collections/community.general/issues/3673).
diff --git a/changelogs/fragments/4.0.1.yml b/changelogs/fragments/4.0.1.yml
deleted file mode 100644
index dc6d2e9a44..0000000000
--- a/changelogs/fragments/4.0.1.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix release for today's Ansible 5.0.0 beta 1.