diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 2a538e81b400..ed19bb957e5d 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -58,7 +58,7 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 #options 	APIC_IO			# Symmetric (APIC) I/O
 # Optionally these may need tweaked, (defaults shown):
 #options 	NCPU=2			# number of CPUs
-#options 	NBUS=4			# number of busses
+#options 	NBUS=8			# number of busses
 #options 	NAPIC=1			# number of IO APICs
 #options 	NINTR=24		# number of INTs
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 0106f167be00..242afd0d6515 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -99,7 +99,7 @@ options 	ROOTDEVNAME=\"ufs:da0s2e\"
 # SMP enables building of a Symmetric MultiProcessor Kernel.
 # APIC_IO enables the use of the IO APIC for Symmetric I/O.
 # NCPU sets the number of CPUs, defaults to 2.
-# NBUS sets the number of busses, defaults to 4.
+# NBUS sets the number of busses, defaults to 8.
 # NAPIC sets the number of IO APICs on the motherboard, defaults to 1.
 # NINTR sets the total number of INTs provided by the motherboard.
 #
@@ -119,7 +119,7 @@ options 	APIC_IO			# Symmetric (APIC) I/O
 
 # Optional, these are the defaults plus 1:
 options 	NCPU=5			# number of CPUs
-options 	NBUS=5			# number of busses
+options 	NBUS=10			# number of busses
 options 	NAPIC=2			# number of IO APICs
 options 	NINTR=25		# number of INTs
 
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 2a538e81b400..ed19bb957e5d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -58,7 +58,7 @@ options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 #options 	APIC_IO			# Symmetric (APIC) I/O
 # Optionally these may need tweaked, (defaults shown):
 #options 	NCPU=2			# number of CPUs
-#options 	NBUS=4			# number of busses
+#options 	NBUS=8			# number of busses
 #options 	NAPIC=1			# number of IO APICs
 #options 	NINTR=24		# number of INTs
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 0106f167be00..242afd0d6515 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -99,7 +99,7 @@ options 	ROOTDEVNAME=\"ufs:da0s2e\"
 # SMP enables building of a Symmetric MultiProcessor Kernel.
 # APIC_IO enables the use of the IO APIC for Symmetric I/O.
 # NCPU sets the number of CPUs, defaults to 2.
-# NBUS sets the number of busses, defaults to 4.
+# NBUS sets the number of busses, defaults to 8.
 # NAPIC sets the number of IO APICs on the motherboard, defaults to 1.
 # NINTR sets the total number of INTs provided by the motherboard.
 #
@@ -119,7 +119,7 @@ options 	APIC_IO			# Symmetric (APIC) I/O
 
 # Optional, these are the defaults plus 1:
 options 	NCPU=5			# number of CPUs
-options 	NBUS=5			# number of busses
+options 	NBUS=10			# number of busses
 options 	NAPIC=2			# number of IO APICs
 options 	NINTR=25		# number of INTs
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 0106f167be00..242afd0d6515 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -99,7 +99,7 @@ options 	ROOTDEVNAME=\"ufs:da0s2e\"
 # SMP enables building of a Symmetric MultiProcessor Kernel.
 # APIC_IO enables the use of the IO APIC for Symmetric I/O.
 # NCPU sets the number of CPUs, defaults to 2.
-# NBUS sets the number of busses, defaults to 4.
+# NBUS sets the number of busses, defaults to 8.
 # NAPIC sets the number of IO APICs on the motherboard, defaults to 1.
 # NINTR sets the total number of INTs provided by the motherboard.
 #
@@ -119,7 +119,7 @@ options 	APIC_IO			# Symmetric (APIC) I/O
 
 # Optional, these are the defaults plus 1:
 options 	NCPU=5			# number of CPUs
-options 	NBUS=5			# number of busses
+options 	NBUS=10			# number of busses
 options 	NAPIC=2			# number of IO APICs
 options 	NINTR=25		# number of INTs