diff --git a/CHANGES b/CHANGES
index 17b28f627f..f545a01b0f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+6072.	[bug]		Avoid the OpenSSL lock contention when initializing
+			Message Digest Contexts by using explicit algorithm
+			fetching, initializing static contexts for every
+			supported algorithms, and initializing the new context
+			by copying the static copy. [GL #3795]
+
 6071.	[func]		The use of "port" when configuring query-source,
 			transfer-source, notify-source and parental-source
 			addresses has been deprecated, along with the
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index cce6f01680..864b1f0dde 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -55,6 +55,9 @@ Bug Fixes
   cause increased memory consumption due to delayed cleaning of view memory.
   This has been fixed. :gl:`#3801`
 
+- Improve the speed of the message digest algorithms (MD5, SHA-1,
+  SHA-2) and NSEC3 hashing. :gl:`#3795`
+
 Known Issues
 ~~~~~~~~~~~~