diff --git a/docs/changelog.rst b/docs/changelog.rst
index 17f3a4101..fd0b9a40d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,19 @@ Release History
 
 .. towncrier release notes start
 
+v20.18.0 (2023-02-06)
+---------------------
+
+Features - 20.18.0
+~~~~~~~~~~~~~~~~~~
+- Drop ``3.6`` runtime support (can still create ``2.7+``) - by :user:`gaborbernat`. (:issue:`2489`)
+
+Bugfixes - 20.18.0
+~~~~~~~~~~~~~~~~~~
+- Fix broken prompt in Nushell when activating virtual environment - by :user:`kubouc`. (:issue:`2481`)
+- Bump embedded pip to ``23.0`` and setuptools to ``67.1`` - by :user:`gaborbernat`. (:issue:`2489`)
+
+
 v20.17.1 (2022-12-05)
 ---------------------
 
diff --git a/docs/changelog/2481.bugfix.rst b/docs/changelog/2481.bugfix.rst
deleted file mode 100644
index 8a6d47178..000000000
--- a/docs/changelog/2481.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken prompt in Nushell when activating virtual environment - by :user:`kubouc`.
diff --git a/docs/changelog/2489.bugfix.rst b/docs/changelog/2489.bugfix.rst
deleted file mode 100644
index 396f2b6b8..000000000
--- a/docs/changelog/2489.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Bump embedded pip to ``23.0`` and setuptools to ``67.1`` - by :user:`gaborbernat`.
diff --git a/docs/changelog/2489.feature.rst b/docs/changelog/2489.feature.rst
deleted file mode 100644
index 1c4161577..000000000
--- a/docs/changelog/2489.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop ``3.6`` runtime support (can still create ``2.7+``) - by :user:`gaborbernat`.