diff --git a/CHANGES b/CHANGES
index a330afad00..d400ed2302 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6019.	[func]		Deprecate `coresize`, `datasize`, `files`, and
+			`stacksize` named.conf options. [GL #3676]
+
 6018.	[cleanup]	Remove the --with-tuning configure option.
 			[GL #3664]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 8af2593e3e..1dedc1b903 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -34,6 +34,11 @@ Feature Changes
   settings that required different values based on "workload" have been either
   removed or a sensible default has been picked.  :gl:`#3664`
 
+- Deprecate setting the operating system limit (``coresize``, ``datasize``,
+  ``files`` and ``stacksize``) from ``named.conf``.  These options should be set
+  from the operating system (``ulimit``) or from the process supervisor
+  (e.g. ``systemd``). :gl:`#3676`
+
 Bug Fixes
 ~~~~~~~~~