diff --git a/CHANGES b/CHANGES
index 8c01f7826c..9f3554ab4e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5544.	[func]		Restore the default value of nocookie-udp-size to 4096.
+			[GL #2250]
+
 5543.	[bug]		Restore the UDP performance after the user netmgr
 			callbacks have been made asynchronous. [GL #2320]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 35cf3cdf0e..e428f287b6 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -51,6 +51,14 @@ Feature Changes
   has a higher chance of being exceeded by non-attack queries, which is the
   main reason for increasing its default value. [GL #2305]
 
+- Restore the ``nocookie-udp-size`` default from 1232 to 4096. Normally the
+  EDNS buffer size is configured by ``max-udp-size``, but this configuration
+  option overrides the value, but most people don't and won't realize there's
+  an extra configuration option that needs to be tweaked. By changing the
+  default here, we allow the the ``max-udp-size`` to be the sole option that
+  needs to be changed when operator wants to change the default EDNS buffer
+  size. [GL #2250]
+
 Bug Fixes
 ~~~~~~~~~