diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index ee79525c5801..5ce973bb2c99 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.324 1997/03/26 17:46:03 ache Exp $
+#	$Id: LINT,v 1.325 1997/03/29 11:06:58 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -744,15 +744,31 @@ device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
 # Options for psm:
 options		PSM_CHECKSYNC		#checks the header byte for sync.
 
-device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+device		sio0	at isa? port "IO_COM1" tty flags 0x10 irq 4 vector siointr
+
+#
+# `flags' for serial drivers that support consoles (only for sio now):
+#	0x10	enable console support for this unit.  The other console flags
+#		are ignored unless this is set.  Enabling console support does
+#		not make the unit the preferred console - boot with -h or set
+#		the 0x20 flag for that.  Currently, at most one unit can have
+#		console support; the first one (in config file order) with
+#		this flag set is preferred.  Setting this flag for sio0 gives
+#		the old behaviour.
+#	0x20	force this unit to be the console (unless there is another
+#		higher priority console).  This replaces the COMCONSOLE option.
+#	0x40	reserve this unit for low level console operations.  Do not
+#
+
+# Options for serial drivers that support consoles (only for sio now):
+options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
+					#DDB, if available.
+options		CONSPEED=115200		#speed for serial console (default 9600)
 
 # Options for sio:
-options		COMCONSOLE		#prefer serial console to video console
 options		COM_ESP			#code for Hayes ESP
 options		COM_MULTIPORT		#code for some cards with shared IRQs
 options		DSI_SOFT_MODEM		#code for DSI Softmodems
-options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
-					#DDB, if available.
 
 #
 # Network interfaces: `cx', `ed', `el', `ep', `ie', `is', `le', `lnc'
@@ -1075,6 +1091,7 @@ options		GATEWAY
 options		CLK_CALIBRATION_LOOP
 options		"CLK_USE_I8254_CALIBRATION"
 options		"CLK_USE_I586_CALIBRATION"
+options		CLUSTERDEBUG
 options		COMPAT_LINUX
 options		DEBUG
 options		DEVFS_ROOT
@@ -1094,6 +1111,7 @@ options		MSGSSZ=16
 options		MSGTQL=41
 options		NBUF=512
 options		NMBCLUSTERS=1024
+options		NPX_DEBUG
 options		PSM_ACCEL=1
 options		PSM_DEBUG=1
 options		PSM_EMULATION
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index ee79525c5801..5ce973bb2c99 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.324 1997/03/26 17:46:03 ache Exp $
+#	$Id: LINT,v 1.325 1997/03/29 11:06:58 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -744,15 +744,31 @@ device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
 # Options for psm:
 options		PSM_CHECKSYNC		#checks the header byte for sync.
 
-device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+device		sio0	at isa? port "IO_COM1" tty flags 0x10 irq 4 vector siointr
+
+#
+# `flags' for serial drivers that support consoles (only for sio now):
+#	0x10	enable console support for this unit.  The other console flags
+#		are ignored unless this is set.  Enabling console support does
+#		not make the unit the preferred console - boot with -h or set
+#		the 0x20 flag for that.  Currently, at most one unit can have
+#		console support; the first one (in config file order) with
+#		this flag set is preferred.  Setting this flag for sio0 gives
+#		the old behaviour.
+#	0x20	force this unit to be the console (unless there is another
+#		higher priority console).  This replaces the COMCONSOLE option.
+#	0x40	reserve this unit for low level console operations.  Do not
+#
+
+# Options for serial drivers that support consoles (only for sio now):
+options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
+					#DDB, if available.
+options		CONSPEED=115200		#speed for serial console (default 9600)
 
 # Options for sio:
-options		COMCONSOLE		#prefer serial console to video console
 options		COM_ESP			#code for Hayes ESP
 options		COM_MULTIPORT		#code for some cards with shared IRQs
 options		DSI_SOFT_MODEM		#code for DSI Softmodems
-options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
-					#DDB, if available.
 
 #
 # Network interfaces: `cx', `ed', `el', `ep', `ie', `is', `le', `lnc'
@@ -1075,6 +1091,7 @@ options		GATEWAY
 options		CLK_CALIBRATION_LOOP
 options		"CLK_USE_I8254_CALIBRATION"
 options		"CLK_USE_I586_CALIBRATION"
+options		CLUSTERDEBUG
 options		COMPAT_LINUX
 options		DEBUG
 options		DEVFS_ROOT
@@ -1094,6 +1111,7 @@ options		MSGSSZ=16
 options		MSGTQL=41
 options		NBUF=512
 options		NMBCLUSTERS=1024
+options		NPX_DEBUG
 options		PSM_ACCEL=1
 options		PSM_DEBUG=1
 options		PSM_EMULATION
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index ee79525c5801..5ce973bb2c99 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.324 1997/03/26 17:46:03 ache Exp $
+#	$Id: LINT,v 1.325 1997/03/29 11:06:58 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -744,15 +744,31 @@ device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
 # Options for psm:
 options		PSM_CHECKSYNC		#checks the header byte for sync.
 
-device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
+device		sio0	at isa? port "IO_COM1" tty flags 0x10 irq 4 vector siointr
+
+#
+# `flags' for serial drivers that support consoles (only for sio now):
+#	0x10	enable console support for this unit.  The other console flags
+#		are ignored unless this is set.  Enabling console support does
+#		not make the unit the preferred console - boot with -h or set
+#		the 0x20 flag for that.  Currently, at most one unit can have
+#		console support; the first one (in config file order) with
+#		this flag set is preferred.  Setting this flag for sio0 gives
+#		the old behaviour.
+#	0x20	force this unit to be the console (unless there is another
+#		higher priority console).  This replaces the COMCONSOLE option.
+#	0x40	reserve this unit for low level console operations.  Do not
+#
+
+# Options for serial drivers that support consoles (only for sio now):
+options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
+					#DDB, if available.
+options		CONSPEED=115200		#speed for serial console (default 9600)
 
 # Options for sio:
-options		COMCONSOLE		#prefer serial console to video console
 options		COM_ESP			#code for Hayes ESP
 options		COM_MULTIPORT		#code for some cards with shared IRQs
 options		DSI_SOFT_MODEM		#code for DSI Softmodems
-options		BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to 
-					#DDB, if available.
 
 #
 # Network interfaces: `cx', `ed', `el', `ep', `ie', `is', `le', `lnc'
@@ -1075,6 +1091,7 @@ options		GATEWAY
 options		CLK_CALIBRATION_LOOP
 options		"CLK_USE_I8254_CALIBRATION"
 options		"CLK_USE_I586_CALIBRATION"
+options		CLUSTERDEBUG
 options		COMPAT_LINUX
 options		DEBUG
 options		DEVFS_ROOT
@@ -1094,6 +1111,7 @@ options		MSGSSZ=16
 options		MSGTQL=41
 options		NBUF=512
 options		NMBCLUSTERS=1024
+options		NPX_DEBUG
 options		PSM_ACCEL=1
 options		PSM_DEBUG=1
 options		PSM_EMULATION