diff --git a/CHANGES b/CHANGES
index b2b7d59835..a49353e09b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5584.	[bug]		Rollback setting IP_DONTFRAG option on the UDP sockets.
+			[GL #2487]
+
 5583.	[func]		Changes to DoH configuration syntax:
 			- When "http" is specified in "listen-on" or
 			  "listen-on-v6" statements, "tls" must also now
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 5fe9644665..a4a2babf21 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -121,3 +121,8 @@ Bug Fixes
   list in ``named.conf``, the wrong size was passed to ``isc_mem_put()``,
   which resulted in the returned memory being put on the wrong freed
   list. This has been fixed. [GL #2460]
+
+- If an outgoing packet would exceed max-udp-size, it would be dropped instead
+  of sending a proper response back.  Rollback setting the IP_DONTFRAG on the
+  UDP sockets that we enabled during the DNS Flag Day 2020 to fix this issue.
+  [GL #2487]