diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index f7780121627..53df8db29cc 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -54,6 +54,19 @@ cpu		HAMMER			# aka K8, aka Opteron & Athlon64
 #
 #XXX#options 	PERFMON
 
+
+#####################################################################
+# PERFORMANCE MONITORING OPTIONS
+
+#
+# The hwpmc driver that allows the use of in-CPU performance monitoring
+# counters for performance monitoring.  The base kernel needs to configured
+# with the 'options' line, while the hwpmc device can be either compiled
+# in or loaded as a loadable kernel module.
+#
+device  	hwpmc			# Driver (also a loadable module)
+options 	HWPMC_HOOKS		# Other necessary kernel hooks
+
 
 #####################################################################
 # NETWORKING OPTIONS
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 2d5ad2706b9..3f2677d75aa 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -420,19 +420,6 @@ options 	REGRESSION
 #
 options 	COMPILING_LINT
 
-
-#####################################################################
-# PERFORMANCE MONITORING OPTIONS
-
-#
-# The hwpmc driver that allows the use of in-CPU performance monitoring
-# counters for performance monitoring.  The base kernel needs to configured
-# with the 'options' line, while the hwpmc device can be either compiled
-# in or loaded as a loadable kernel module.
-#
-device  	hwpmc			# Driver (also a loadable module)
-options 	HWPMC_HOOKS		# Other necessary kernel hooks
-
 
 #####################################################################
 # NETWORKING OPTIONS
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 3da74fdfa82..d5d334fffda 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -212,6 +212,19 @@ options 	NPX_DEBUG	# enable npx debugging
 #
 options 	PERFMON
 
+
+#####################################################################
+# PERFORMANCE MONITORING OPTIONS
+
+#
+# The hwpmc driver that allows the use of in-CPU performance monitoring
+# counters for performance monitoring.  The base kernel needs to configured
+# with the 'options' line, while the hwpmc device can be either compiled
+# in or loaded as a loadable kernel module.
+#
+device  	hwpmc			# Driver (also a loadable module)
+options 	HWPMC_HOOKS		# Other necessary kernel hooks
+
 
 #####################################################################
 # NETWORKING OPTIONS
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 1e66b8ac728..c401c113e0d 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -175,6 +175,19 @@ options 	NPX_DEBUG	# enable npx debugging
 #
 options 	PERFMON
 
+
+#####################################################################
+# PERFORMANCE MONITORING OPTIONS
+
+#
+# The hwpmc driver that allows the use of in-CPU performance monitoring
+# counters for performance monitoring.  The base kernel needs to configured
+# with the 'options' line, while the hwpmc device can be either compiled
+# in or loaded as a loadable kernel module.
+#
+device  	hwpmc			# Driver (also a loadable module)
+options 	HWPMC_HOOKS		# Other necessary kernel hooks
+
 
 #####################################################################
 # NETWORKING OPTIONS