diff --git a/CHANGES.rst b/CHANGES.rst
index 744130fb8e5..7713e622772 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,21 @@
 
 .. towncrier release notes start
 
+3.8.4 (2023-02-12)
+==================
+
+Bugfixes
+--------
+
+- Fixed incorrectly overwriting cookies with the same name and domain, but different path.
+  `#6638 <https://github.com/aio-libs/aiohttp/issues/6638>`_
+- Fixed ``ConnectionResetError`` not being raised after client disconnection in SSL environments.
+  `#7180 <https://github.com/aio-libs/aiohttp/issues/7180>`_
+
+
+----
+
+
 3.8.3 (2022-09-21)
 ==================
 
diff --git a/CHANGES/6638.bugfix b/CHANGES/6638.bugfix
deleted file mode 100644
index 8154dcfe3f3..00000000000
--- a/CHANGES/6638.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not overwrite cookies with same name and domain when the path is different.
diff --git a/CHANGES/7180.bugfix b/CHANGES/7180.bugfix
deleted file mode 100644
index 66980638868..00000000000
--- a/CHANGES/7180.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-``ConnectionResetError`` will always be raised when ``StreamWriter.write`` is called after ``connection_lost`` has been called on the ``BaseProtocol``
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
index eea9a669cf9..34022f0f8c6 100644
--- a/aiohttp/__init__.py
+++ b/aiohttp/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "3.8.3.post0.dev0"
+__version__ = "3.8.4"
 
 from typing import Tuple