Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -26,6 +26,11 @@
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20191120:
+	The amd(8) automount daemon has been disabled by default, and will be
+	removed in the future.  As of FreeBSD 10.1 the autofs(5) is available
+	for automounting.
+
 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
Index: head/share/mk/src.opts.mk
===================================================================
--- head/share/mk/src.opts.mk
+++ head/share/mk/src.opts.mk
@@ -55,7 +55,6 @@
 __DEFAULT_YES_OPTIONS = \
     ACCT \
     ACPI \
-    AMD \
     APM \
     AT \
     ATM \
@@ -193,6 +192,7 @@
     ZONEINFO
 
 __DEFAULT_NO_OPTIONS = \
+    AMD \
     BEARSSL \
     BSD_GREP \
     CLANG_EXTRAS \