diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4b35c54378..aba4de8717 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,34 @@ Community General Release Notes
 
 This changelog describes changes after version 2.0.0.
 
+v3.8.5
+======
+
+Release Summary
+---------------
+
+Regular bugfix release.
+
+Bugfixes
+--------
+
+- dconf - skip processes that disappeared while we inspected them (https://github.com/ansible-collections/community.general/issues/4151).
+- gitlab_runner - use correct API endpoint to create and retrieve project level runners when using ``project`` (https://github.com/ansible-collections/community.general/pull/3965).
+- homebrew_cask - fix force install operation (https://github.com/ansible-collections/community.general/issues/3703).
+- imc_rest - fixes the module failure due to the usage of ``itertools.izip_longest`` which is not available in Python 3 (https://github.com/ansible-collections/community.general/issues/4206).
+- ini_file - when removing nothing do not report changed (https://github.com/ansible-collections/community.general/issues/4154).
+- keycloak_user_federation - creating a user federation while specifying an ID (that does not exist yet) no longer fail with a 404 Not Found (https://github.com/ansible-collections/community.general/pull/4212).
+- keycloak_user_federation - mappers auto-created by keycloak are matched and merged by their name and no longer create duplicated entries (https://github.com/ansible-collections/community.general/pull/4212).
+- mail callback plugin - fix crash on Python 3 (https://github.com/ansible-collections/community.general/issues/4025, https://github.com/ansible-collections/community.general/pull/4026).
+- passwordstore lookup plugin - fix error detection for non-English locales (https://github.com/ansible-collections/community.general/pull/4219).
+- passwordstore lookup plugin - prevent returning path names as passwords by accident (https://github.com/ansible-collections/community.general/issues/4185, https://github.com/ansible-collections/community.general/pull/4192).
+- python_requirements_info - store ``mismatched`` return values per package as documented in the module (https://github.com/ansible-collections/community.general/pull/4078).
+- vdo - fix options error (https://github.com/ansible-collections/community.general/pull/4163).
+- yarn - fix incorrect handling of ``yarn list`` and ``yarn global list`` output that could result in fatal error (https://github.com/ansible-collections/community.general/pull/4050).
+- yarn - fix incorrectly reported status when installing a package globally (https://github.com/ansible-collections/community.general/issues/4045, https://github.com/ansible-collections/community.general/pull/4050).
+- yarn - fix missing ``~`` expansion in yarn global install folder which resulted in incorrect task status (https://github.com/ansible-collections/community.general/issues/4045, https://github.com/ansible-collections/community.general/pull/4048).
+- yum_versionlock - fix matching of existing entries with names passed to the module. Match yum and dnf lock format (https://github.com/ansible-collections/community.general/pull/4183).
+
 v3.8.4
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index c7161fa34b..32fa07bacd 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -2066,3 +2066,54 @@ releases:
     - 3940_fix_contenttype_scaleway_user_data.yml
     - 3976-fix-alternatives-parsing.yml
     release_date: '2022-01-11'
+  3.8.5:
+    changes:
+      bugfixes:
+      - dconf - skip processes that disappeared while we inspected them (https://github.com/ansible-collections/community.general/issues/4151).
+      - gitlab_runner - use correct API endpoint to create and retrieve project level
+        runners when using ``project`` (https://github.com/ansible-collections/community.general/pull/3965).
+      - homebrew_cask - fix force install operation (https://github.com/ansible-collections/community.general/issues/3703).
+      - imc_rest - fixes the module failure due to the usage of ``itertools.izip_longest``
+        which is not available in Python 3 (https://github.com/ansible-collections/community.general/issues/4206).
+      - ini_file - when removing nothing do not report changed (https://github.com/ansible-collections/community.general/issues/4154).
+      - keycloak_user_federation - creating a user federation while specifying an
+        ID (that does not exist yet) no longer fail with a 404 Not Found (https://github.com/ansible-collections/community.general/pull/4212).
+      - keycloak_user_federation - mappers auto-created by keycloak are matched and
+        merged by their name and no longer create duplicated entries (https://github.com/ansible-collections/community.general/pull/4212).
+      - mail callback plugin - fix crash on Python 3 (https://github.com/ansible-collections/community.general/issues/4025,
+        https://github.com/ansible-collections/community.general/pull/4026).
+      - passwordstore lookup plugin - fix error detection for non-English locales
+        (https://github.com/ansible-collections/community.general/pull/4219).
+      - passwordstore lookup plugin - prevent returning path names as passwords by
+        accident (https://github.com/ansible-collections/community.general/issues/4185,
+        https://github.com/ansible-collections/community.general/pull/4192).
+      - python_requirements_info - store ``mismatched`` return values per package
+        as documented in the module (https://github.com/ansible-collections/community.general/pull/4078).
+      - vdo - fix options error (https://github.com/ansible-collections/community.general/pull/4163).
+      - yarn - fix incorrect handling of ``yarn list`` and ``yarn global list`` output
+        that could result in fatal error (https://github.com/ansible-collections/community.general/pull/4050).
+      - yarn - fix incorrectly reported status when installing a package globally
+        (https://github.com/ansible-collections/community.general/issues/4045, https://github.com/ansible-collections/community.general/pull/4050).
+      - yarn - fix missing ``~`` expansion in yarn global install folder which resulted
+        in incorrect task status (https://github.com/ansible-collections/community.general/issues/4045,
+        https://github.com/ansible-collections/community.general/pull/4048).
+      - yum_versionlock - fix matching of existing entries with names passed to the
+        module. Match yum and dnf lock format (https://github.com/ansible-collections/community.general/pull/4183).
+      release_summary: Regular bugfix release.
+    fragments:
+    - 3.8.5.yml
+    - 3703-force-install-homebrew-cask.yml
+    - 3916-fix-vdo-options-type.yml
+    - 3935-use-gitlab-instance-runner-to-create-runner.yml
+    - 4026-fix-mail-callback.yml
+    - 4048-expand-tilde-in-yarn-global-install-folder.yaml
+    - 4050-properly-parse-json-lines-output-from-yarn.yaml
+    - 4078-python_requirements_info.yaml
+    - 4151-dconf-catch-psutil-nosuchprocess.yaml
+    - 4154-ini_file_changed.yml
+    - 4183-fix-yum_versionlock.yaml
+    - 4192-improve-passwordstore-consistency.yml
+    - 4206-imc-rest-module.yaml
+    - 4212-fixes-for-keycloak-user-federation.yml
+    - 4219-passwordstore-locale-fix.yml
+    release_date: '2022-02-22'
diff --git a/changelogs/fragments/3.8.5.yml b/changelogs/fragments/3.8.5.yml
deleted file mode 100644
index 1b14bd80d1..0000000000
--- a/changelogs/fragments/3.8.5.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular bugfix release.
diff --git a/changelogs/fragments/3703-force-install-homebrew-cask.yml b/changelogs/fragments/3703-force-install-homebrew-cask.yml
deleted file mode 100644
index 781735a5fe..0000000000
--- a/changelogs/fragments/3703-force-install-homebrew-cask.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - homebrew_cask - fix force install operation (https://github.com/ansible-collections/community.general/issues/3703).
diff --git a/changelogs/fragments/3916-fix-vdo-options-type.yml b/changelogs/fragments/3916-fix-vdo-options-type.yml
deleted file mode 100644
index badf171f5b..0000000000
--- a/changelogs/fragments/3916-fix-vdo-options-type.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - vdo - fix options error (https://github.com/ansible-collections/community.general/pull/4163).
diff --git a/changelogs/fragments/3935-use-gitlab-instance-runner-to-create-runner.yml b/changelogs/fragments/3935-use-gitlab-instance-runner-to-create-runner.yml
deleted file mode 100644
index cbd61a88b1..0000000000
--- a/changelogs/fragments/3935-use-gitlab-instance-runner-to-create-runner.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - 'gitlab_runner - use correct API endpoint to create and retrieve project level runners when using ``project`` (https://github.com/ansible-collections/community.general/pull/3965).'
diff --git a/changelogs/fragments/4026-fix-mail-callback.yml b/changelogs/fragments/4026-fix-mail-callback.yml
deleted file mode 100644
index bd5327805b..0000000000
--- a/changelogs/fragments/4026-fix-mail-callback.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - mail callback plugin - fix crash on Python 3 (https://github.com/ansible-collections/community.general/issues/4025, https://github.com/ansible-collections/community.general/pull/4026).
diff --git a/changelogs/fragments/4048-expand-tilde-in-yarn-global-install-folder.yaml b/changelogs/fragments/4048-expand-tilde-in-yarn-global-install-folder.yaml
deleted file mode 100644
index 43e062e7c3..0000000000
--- a/changelogs/fragments/4048-expand-tilde-in-yarn-global-install-folder.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - yarn - fix missing ``~`` expansion in yarn global install folder which resulted in incorrect task status (https://github.com/ansible-collections/community.general/issues/4045, https://github.com/ansible-collections/community.general/pull/4048).
diff --git a/changelogs/fragments/4050-properly-parse-json-lines-output-from-yarn.yaml b/changelogs/fragments/4050-properly-parse-json-lines-output-from-yarn.yaml
deleted file mode 100644
index 67094f4701..0000000000
--- a/changelogs/fragments/4050-properly-parse-json-lines-output-from-yarn.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-bugfixes:
-  - yarn - fix incorrect handling of ``yarn list`` and ``yarn global list`` output that could result in fatal error (https://github.com/ansible-collections/community.general/pull/4050).
-  - yarn - fix incorrectly reported status when installing a package globally (https://github.com/ansible-collections/community.general/issues/4045, https://github.com/ansible-collections/community.general/pull/4050).
diff --git a/changelogs/fragments/4078-python_requirements_info.yaml b/changelogs/fragments/4078-python_requirements_info.yaml
deleted file mode 100644
index db6aa8ab77..0000000000
--- a/changelogs/fragments/4078-python_requirements_info.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - python_requirements_info - store ``mismatched`` return values per package as documented in the module (https://github.com/ansible-collections/community.general/pull/4078).
\ No newline at end of file
diff --git a/changelogs/fragments/4151-dconf-catch-psutil-nosuchprocess.yaml b/changelogs/fragments/4151-dconf-catch-psutil-nosuchprocess.yaml
deleted file mode 100644
index 6856af8a28..0000000000
--- a/changelogs/fragments/4151-dconf-catch-psutil-nosuchprocess.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "dconf - skip processes that disappeared while we inspected them (https://github.com/ansible-collections/community.general/issues/4151)."
diff --git a/changelogs/fragments/4154-ini_file_changed.yml b/changelogs/fragments/4154-ini_file_changed.yml
deleted file mode 100644
index f3dbb6bab8..0000000000
--- a/changelogs/fragments/4154-ini_file_changed.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - ini_file - when removing nothing do not report changed (https://github.com/ansible-collections/community.general/issues/4154).
diff --git a/changelogs/fragments/4183-fix-yum_versionlock.yaml b/changelogs/fragments/4183-fix-yum_versionlock.yaml
deleted file mode 100644
index 07b525cc59..0000000000
--- a/changelogs/fragments/4183-fix-yum_versionlock.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "yum_versionlock - fix matching of existing entries with names passed to the module. Match yum and dnf lock format (https://github.com/ansible-collections/community.general/pull/4183)."
diff --git a/changelogs/fragments/4192-improve-passwordstore-consistency.yml b/changelogs/fragments/4192-improve-passwordstore-consistency.yml
deleted file mode 100644
index bf50669c34..0000000000
--- a/changelogs/fragments/4192-improve-passwordstore-consistency.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - passwordstore lookup plugin - prevent returning path names as passwords by accident (https://github.com/ansible-collections/community.general/issues/4185, https://github.com/ansible-collections/community.general/pull/4192).
diff --git a/changelogs/fragments/4206-imc-rest-module.yaml b/changelogs/fragments/4206-imc-rest-module.yaml
deleted file mode 100644
index e36305e31b..0000000000
--- a/changelogs/fragments/4206-imc-rest-module.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - imc_rest - fixes the module failure due to the usage of ``itertools.izip_longest`` which is not available in Python 3 (https://github.com/ansible-collections/community.general/issues/4206).
diff --git a/changelogs/fragments/4212-fixes-for-keycloak-user-federation.yml b/changelogs/fragments/4212-fixes-for-keycloak-user-federation.yml
deleted file mode 100644
index 033add7a90..0000000000
--- a/changelogs/fragments/4212-fixes-for-keycloak-user-federation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-bugfixes:
-  - keycloak_user_federation - creating a user federation while specifying an
-    ID (that does not exist yet) no longer fail with a 404 Not Found
-    (https://github.com/ansible-collections/community.general/pull/4212).
-  - keycloak_user_federation - mappers auto-created by keycloak are matched and
-    merged by their name and no longer create duplicated entries
-    (https://github.com/ansible-collections/community.general/pull/4212).
diff --git a/changelogs/fragments/4219-passwordstore-locale-fix.yml b/changelogs/fragments/4219-passwordstore-locale-fix.yml
deleted file mode 100644
index 540b475fb3..0000000000
--- a/changelogs/fragments/4219-passwordstore-locale-fix.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - passwordstore lookup plugin - fix error detection for non-English locales (https://github.com/ansible-collections/community.general/pull/4219).