diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 57793568c1..095e606fce 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 58.3.0
+current_version = 58.4.0
 commit = True
 tag = True
 
diff --git a/CHANGES.rst b/CHANGES.rst
index f9612cfea3..89e525c454 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,20 @@
+v58.4.0
+-------
+
+
+Changes
+^^^^^^^
+* #2497: Officially deprecated PEP 440 non-compliant versions.
+
+Documentation changes
+^^^^^^^^^^^^^^^^^^^^^
+* #2932: Removed the deprecated ``data_files`` option from the example in the
+  declarative configuration docs -- by :user:`abravalheri`
+* #2932: Change type of ``data_files`` option from ``dict`` to ``section`` in
+  declarative configuration docs (to match previous example) -- by
+  :user:`abravalheri`
+
+
 v58.3.0
 -------
 
diff --git a/changelog.d/2497.change.rst b/changelog.d/2497.change.rst
deleted file mode 100644
index 91d840f7a7..0000000000
--- a/changelog.d/2497.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Officially deprecated PEP 440 non-compliant versions.
diff --git a/changelog.d/2932.doc.1.rst b/changelog.d/2932.doc.1.rst
deleted file mode 100644
index fd547d1642..0000000000
--- a/changelog.d/2932.doc.1.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Removed the deprecated ``data_files`` option from the example in the
-declarative configuration docs -- by :user:`abravalheri`
diff --git a/changelog.d/2932.doc.2.rst b/changelog.d/2932.doc.2.rst
deleted file mode 100644
index 2b341c097f..0000000000
--- a/changelog.d/2932.doc.2.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Change type of ``data_files`` option from ``dict`` to ``section`` in
-declarative configuration docs (to match previous example) -- by
-:user:`abravalheri`
diff --git a/setup.cfg b/setup.cfg
index 885ee07efe..50622ccf69 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 58.3.0
+version = 58.4.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages