diff --git a/CHANGES b/CHANGES
index 65758522b0..0b2dd2d036 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5510.	[bug]		Implement the attach/detach semantics for dns_message_t
+			to fix a data race in accessing already destroyed
+			fctx->rmessage. [GL #2124]
+
 5509.	[bug]		filter-aaaa: named crashed upon shutdown if it was in
 			the process of recursing for A RRsets. [GL #1040]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index bc5b4659bf..0593f8814f 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -50,3 +50,6 @@ Bug Fixes
 - `named` would report invalid memory size when running in an environment
   that doesn't properly report number of available memory pages or pagesize.
   [GL #2166]
+
+- `named` would exit with assertion failure REQUIRE(msg->state == (-1)) in
+  message.c due to a possible data race. [GL #2124]