diff --git a/CHANGES.rst b/CHANGES.rst
index 7713e622772..d929a0acc0d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,45 @@
 
 .. towncrier release notes start
 
+3.8.5 (2023-07-19)
+==================
+
+Security bugfixes
+-----------------
+
+- Upgraded the vendored copy of llhttp_ to v8.1.1 -- by :user:`webknjaz`
+  and :user:`Dreamsorcerer`.
+
+  Thanks to :user:`sethmlarson` for reporting this and providing us with
+  comprehensive reproducer, workarounds and fixing details! For more
+  information, see
+  https://github.com/aio-libs/aiohttp/security/advisories/GHSA-45c4-8wx5-qw6w.
+
+  .. _llhttp: https://llhttp.org
+
+  `#7346 <https://github.com/aio-libs/aiohttp/issues/7346>`_
+
+
+Features
+--------
+
+- Added information to C parser exceptions to show which character caused the error. -- by :user:`Dreamsorcerer`
+
+  `#7366 <https://github.com/aio-libs/aiohttp/issues/7366>`_
+
+
+Bugfixes
+--------
+
+- Fixed a transport is :data:`None` error -- by :user:`Dreamsorcerer`.
+
+  `#3355 <https://github.com/aio-libs/aiohttp/issues/3355>`_
+
+
+
+----
+
+
 3.8.4 (2023-02-12)
 ==================
 
diff --git a/CHANGES/3355.bugfix b/CHANGES/3355.bugfix
deleted file mode 100644
index fd002cb00df..00000000000
--- a/CHANGES/3355.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a transport is :data:`None` error -- by :user:`Dreamsorcerer`.
diff --git a/CHANGES/7346.feature b/CHANGES/7346.feature
deleted file mode 100644
index 9f91e6b7424..00000000000
--- a/CHANGES/7346.feature
+++ /dev/null
@@ -1,5 +0,0 @@
-Upgrade the vendored copy of llhttp_ to v8.1.1 -- by :user:`webknjaz`.
-
-Thanks to :user:`sethmlarson` for pointing this out!
-
-.. _llhttp: https://llhttp.org
diff --git a/CHANGES/7366.feature b/CHANGES/7366.feature
deleted file mode 100644
index 8e38f70f898..00000000000
--- a/CHANGES/7366.feature
+++ /dev/null
@@ -1 +0,0 @@
-Added information to C parser exceptions to show which character caused the error. -- by :user:`Dreamsorcerer`
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
index a4fc5ec82d1..317a47bbad8 100644
--- a/aiohttp/__init__.py
+++ b/aiohttp/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "3.8.4.post0.dev0"
+__version__ = "3.8.5"
 
 from typing import Tuple
 
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index af6c4082e70..1626b180944 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -39,6 +39,7 @@ botocore
 brotli
 brotlipy
 bugfix
+bugfixes
 Bugfixes
 builtin
 BytesIO