diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 72e30b590c2e..1a2a382b53db 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.32 1995/02/15 20:38:36 joerg Exp $
+#	$Id: GENERIC,v 1.33 1995/03/02 04:06:03 jkh Exp $
 #
 
 machine		"i386"
@@ -75,6 +75,7 @@ device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
 #device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 #options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
+#options		XSERVER			# include code for XFree86
 
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f5fbc65a3e06..957b22d5471b 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.149 1995/03/02 04:06:07 jkh Exp $
+#	$Id: LINT,v 1.150 1995/03/04 21:09:21 jkh 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
@@ -369,6 +369,7 @@ options		BOUNCE_BUFFERS
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
 #device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 #options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
+#options		XSERVER			# include code for XFree86
 
 # The syscons console driver (sco color console compatible) - default.
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 72e30b590c2e..1a2a382b53db 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.32 1995/02/15 20:38:36 joerg Exp $
+#	$Id: GENERIC,v 1.33 1995/03/02 04:06:03 jkh Exp $
 #
 
 machine		"i386"
@@ -75,6 +75,7 @@ device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
 #device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 #options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
+#options		XSERVER			# include code for XFree86
 
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index f5fbc65a3e06..957b22d5471b 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.149 1995/03/02 04:06:07 jkh Exp $
+#	$Id: LINT,v 1.150 1995/03/04 21:09:21 jkh 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
@@ -369,6 +369,7 @@ options		BOUNCE_BUFFERS
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
 #device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 #options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
+#options		XSERVER			# include code for XFree86
 
 # The syscons console driver (sco color console compatible) - default.
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index f5fbc65a3e06..957b22d5471b 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.149 1995/03/02 04:06:07 jkh Exp $
+#	$Id: LINT,v 1.150 1995/03/04 21:09:21 jkh 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
@@ -369,6 +369,7 @@ options		BOUNCE_BUFFERS
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
 #device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 #options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
+#options		XSERVER			# include code for XFree86
 
 # The syscons console driver (sco color console compatible) - default.
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr