diff --git a/CHANGES.rst b/CHANGES.rst
index 149530eb9..3d7dc247f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,6 +13,22 @@ Changelog
 
 .. towncrier release notes start
 
+3.21.1 (2023-07-06)
+===================
+
+
+Bugfixes
+--------
+
+- Fixed a deadlock during concurrent syncs of rpm-repos that need data fixups.
+  `#2980 <https://github.com/pulp/pulp_rpm/issues/2980>`__
+- Made 0048 migration more robust in the face of unexpected data.
+  `#3177 <https://github.com/pulp/pulp_rpm/issues/3177>`__
+
+
+----
+
+
 3.21.0 (2023-05-17)
 ===================
 
diff --git a/CHANGES/2980.bugfix b/CHANGES/2980.bugfix
deleted file mode 100644
index 9e129f5de..000000000
--- a/CHANGES/2980.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a deadlock during concurrent syncs of rpm-repos that need data fixups.
diff --git a/CHANGES/3177.bugfix b/CHANGES/3177.bugfix
deleted file mode 100644
index 4e40a70a3..000000000
--- a/CHANGES/3177.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Made 0048 migration more robust in the face of unexpected data.