diff --git a/UPDATING b/UPDATING
index fcb9817bb902..a25e71653b8a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20170701:
+	WITHOUT_RCMDS is now the default. Set WITH_RCMDS if you need them to be
+	built with the base system.
+
 20170625:
 	The FreeBSD/powerpc platform now uses a 64-bit type for time_t.  This is
 	a very major ABI incompatible change, so users of FreeBSD/powerpc must
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 6c166fc667e4..01fa32159c9b 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -144,7 +144,6 @@ __DEFAULT_YES_OPTIONS = \
     PPP \
     QUOTAS \
     RADIUS_SUPPORT \
-    RCMDS \
     RBOOTD \
     RESCUE \
     ROUTED \
@@ -185,6 +184,7 @@ __DEFAULT_NO_OPTIONS = \
     NAND \
     OFED \
     OPENLDAP \
+    RCMDS \
     REPRODUCIBLE_BUILD \
     RPCBIND_WARMSTART_SUPPORT \
     SHARED_TOOLCHAIN \