diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index b5d4833dced8..6cc53effde21 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -42,6 +42,11 @@ device		atpic			# Optional legacy pic support
 device		mptable			# Optional MPSPEC mptable support
 options 	NO_MIXED_MODE		# Disable use of mixed mode
 
+#
+# Watchdog routines.
+#
+options 	MP_WATCHDOG
+
 
 #####################################################################
 # CPU OPTIONS
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 8df31a7c4bad..ad10d56e8cbe 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -55,6 +55,11 @@ device		apic			# I/O apic
 options		MPTABLE_FORCE_HTT	# Enable HTT CPUs with the MP Table
 options 	NO_MIXED_MODE		# Disable use of mixed mode
 
+#
+# Watchdog routines.
+#
+options 	MP_WATCHDOG
+
 
 #####################################################################
 # CPU OPTIONS