diff --git a/CHANGES b/CHANGES
index 4d73a73b37..a330afad00 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6018.	[cleanup]	Remove the --with-tuning configure option.
+			[GL #3664]
+
 6017.	[bug]		The view's zone table was not locked when it should
 			have been leading to race conditions when external
 			extensions that manipulate the zone table where in
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index d4c9bb2ad6..8af2593e3e 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -30,8 +30,9 @@ Removed Features
 Feature Changes
 ~~~~~~~~~~~~~~~
 
-- The NSEC3PARAM TTL was previously set to 0 and is now changed to be the same
-  value as in the SOA MINIMUM field. :gl:`#3570`
+- A ``configure`` option ``--with-tuning`` has been removed.  The compile-time
+  settings that required different values based on "workload" have been either
+  removed or a sensible default has been picked.  :gl:`#3664`
 
 Bug Fixes
 ~~~~~~~~~