diff --git a/CHANGES b/CHANGES
index d372165be2..238f14e607 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6241.	[bug]		Take into account the possibility of partial TLS writes
+			in TLS DNS code. That helps to prevent DNS messages
+			corruption on long DNS over TLS streams. [GL #4255]
+
 6240.	[bug]		Use dedicated per-worker thread jemalloc memory
 			arenas for send buffers allocation to reduce memory
 			consumption and avoid lock contention. [GL #4038]
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index ce786ef432..8bc1bb5561 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -69,6 +69,8 @@ Bug Fixes
   allowed us to optimize the process of returning memory pages back to
   the operating system. :gl:`#4038`
 
+- Prevent DNS message corruption on long DNS over TLS streams. :gl:`#4255`
+
 Known Issues
 ~~~~~~~~~~~~