diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6a2d6d4adf..079fb998a3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,19 @@ Community General Release Notes
 
 This changelog describes changes after version 4.0.0.
 
+v5.8.9
+======
+
+Release Summary
+---------------
+
+Bugfix release.
+
+Bugfixes
+--------
+
+- passwordstore lookup plugin - make compatible with ansible-core 2.16 (https://github.com/ansible-collections/community.general/pull/6447).
+
 v5.8.8
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 456a554b44..c72f7a494d 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1588,3 +1588,12 @@ releases:
     - 6401-rhsm_release-required.yml
     - 6404-ini_file-section.yml
     release_date: '2023-04-24'
+  5.8.9:
+    changes:
+      bugfixes:
+      - passwordstore lookup plugin - make compatible with ansible-core 2.16 (https://github.com/ansible-collections/community.general/pull/6447).
+      release_summary: Bugfix release.
+    fragments:
+    - 5.8.9.yml
+    - passwordstore-lock.yml
+    release_date: '2023-07-16'
diff --git a/changelogs/fragments/5.8.9.yml b/changelogs/fragments/5.8.9.yml
deleted file mode 100644
index 8ce9aa961c..0000000000
--- a/changelogs/fragments/5.8.9.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix release.
diff --git a/changelogs/fragments/passwordstore-lock.yml b/changelogs/fragments/passwordstore-lock.yml
deleted file mode 100644
index 0d1f3cc9c3..0000000000
--- a/changelogs/fragments/passwordstore-lock.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "passwordstore lookup plugin - make compatible with ansible-core 2.16 (https://github.com/ansible-collections/community.general/pull/6447)."