diff --git a/UPDATING b/UPDATING
index c8afad74d585..649ea8f5203d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,14 +31,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	removed in the future.  As of FreeBSD 10.1 the autofs(5) is available
 	for automounting.
 
-20191120:
-	Defining the long deprecated NO_CTF, NO_DEBUG_FILES, NO_INSTALLLIB,
-	NO_MAN, NO_PROFILE, and NO_WARNS variables is now an error.  Update
-	your Makefiles and scripts to define MK_<var>=no instead as required.
-
-	One exception to this is that program or library Makefiles should
-	define MAN to empty rather than setting MK_MAN=no.
-
 20191107:
 	The nctgpio and wbwd drivers have been moved to the superio bus.
 	If you have one of these drivers in a kernel configuration, then
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 961508571b42..8c410617a33a 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -100,7 +100,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
     PROFILE \
     WARNS
 .if defined(NO_${var})
-.error "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
+.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
 MK_${var}:=no
 .endif
 .endfor