diff --git a/docs/changelog.rst b/docs/changelog.rst
index 10364b324..d0be7ea44 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,21 @@ Release History
 
 .. towncrier release notes start
 
+v4.21.1 (2024-10-02)
+--------------------
+
+Bugfixes - 4.21.1
+~~~~~~~~~~~~~~~~~
+- Fix error when using ``requires`` within a TOML configuration file - by :user:`gaborbernat`. (:issue:`3386`)
+- Fix error when using ``deps`` within a TOML configuration file - by :user:`gaborbernat`. (:issue:`3387`)
+- Multiple fixes for the TOML configuration by :user:`gaborbernat`.:
+
+  - Do not fail when there is an empty command within ``commands``.
+  - Allow references for ``set_env`` by accepting list of dictionaries for it.
+  - Do not try to be smart about reference unrolling, instead allow the user to control it via the ``extend`` flag,
+    available both for ``posargs`` and ``ref`` replacements.
+  - The ``ref`` replacements ``raw`` key has been renamed to ``of``. (:issue:`3388`)
+
 v4.21.0 (2024-09-30)
 --------------------
 
diff --git a/docs/changelog/3386.bugfix.rst b/docs/changelog/3386.bugfix.rst
deleted file mode 100644
index 7b8ed607a..000000000
--- a/docs/changelog/3386.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix error when using ``requires`` within a TOML configuration file - by :user:`gaborbernat`.
diff --git a/docs/changelog/3387.bugfix.rst b/docs/changelog/3387.bugfix.rst
deleted file mode 100644
index 3c6f70bc8..000000000
--- a/docs/changelog/3387.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix error when using ``deps`` within a TOML configuration file - by :user:`gaborbernat`.
diff --git a/docs/changelog/3388.bugfix.rst b/docs/changelog/3388.bugfix.rst
deleted file mode 100644
index 985bb05ab..000000000
--- a/docs/changelog/3388.bugfix.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Multiple fixes for the TOML configuration by :user:`gaborbernat`.:
-
-- Do not fail when there is an empty command within ``commands``.
-- Allow references for ``set_env`` by accepting list of dictionaries for it.
-- Do not try to be smart about reference unrolling, instead allow the user to control it via the ``extend`` flag,
-  available both for ``posargs`` and ``ref`` replacements.
-- The ``ref`` replacements ``raw`` key has been renamed to ``of``.