diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 55d674a5df8..a5c74c85566 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -11,16 +11,17 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.107 1998/02/16 23:57:03 msmith Exp $
+#	$Id: GENERIC,v 1.1 1998/06/10 10:53:56 dfr Exp $
 
 machine		"alpha"
 cpu		"EV5"
 ident		GENERIC
 maxusers	10
 
-options		__FreeBSD__=3		#XXX hack city
+# Platforms supported
+options		"DEC_EB164"		# EB164, PC164, PC164LX, PC164SX
+options		"DEC_KN20AA"		# AlphaStation 500, 600
 
-#options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
 options		NFS			#Network Filesystem
@@ -37,21 +38,39 @@ options		FAILSAFE		#Be conservative
 
 config		kernel	root on sd0
 
+# Platform chipsets
+controller	cia0
+
+# Standard busses
+controller	pci0
+controller	isa0
+
+# A single entry for any of these controllers (ncr, ahb, ahc, amd) is
+# sufficient for any number of installed devices.
+controller	ncr0
+controller	isp0
+
 controller	scbus0
 
 device		sd0
-
-device		od0	#See LINT for possible `od' options.
-
+device		od0
 device		st0
+device		cd0
 
-device		cd0	#Only need one of these, the code dynamically grows
+# real time clock
+device		mcclock0 at isa0 port 0x70
+
+# syscons is the default console driver, resembling an SCO console
+device		sc0	at isa? port "IO_KBD" irq 1
+
+device		sio0	at isa0 port "IO_COM1" irq 4
+device		sio1	at isa0 port "IO_COM2" irq 3 flags 0x50
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
-#device de0
+device de0
 
 pseudo-device	loop
 pseudo-device	ether
@@ -71,4 +90,4 @@ options		KTRACE		#kernel tracing
 options		SYSVSHM
 
 options		DDB
-
+options		DB_ELF_SYMBOLS
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 55d674a5df8..a5c74c85566 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -11,16 +11,17 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.107 1998/02/16 23:57:03 msmith Exp $
+#	$Id: GENERIC,v 1.1 1998/06/10 10:53:56 dfr Exp $
 
 machine		"alpha"
 cpu		"EV5"
 ident		GENERIC
 maxusers	10
 
-options		__FreeBSD__=3		#XXX hack city
+# Platforms supported
+options		"DEC_EB164"		# EB164, PC164, PC164LX, PC164SX
+options		"DEC_KN20AA"		# AlphaStation 500, 600
 
-#options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
 options		NFS			#Network Filesystem
@@ -37,21 +38,39 @@ options		FAILSAFE		#Be conservative
 
 config		kernel	root on sd0
 
+# Platform chipsets
+controller	cia0
+
+# Standard busses
+controller	pci0
+controller	isa0
+
+# A single entry for any of these controllers (ncr, ahb, ahc, amd) is
+# sufficient for any number of installed devices.
+controller	ncr0
+controller	isp0
+
 controller	scbus0
 
 device		sd0
-
-device		od0	#See LINT for possible `od' options.
-
+device		od0
 device		st0
+device		cd0
 
-device		cd0	#Only need one of these, the code dynamically grows
+# real time clock
+device		mcclock0 at isa0 port 0x70
+
+# syscons is the default console driver, resembling an SCO console
+device		sc0	at isa? port "IO_KBD" irq 1
+
+device		sio0	at isa0 port "IO_COM1" irq 4
+device		sio1	at isa0 port "IO_COM2" irq 3 flags 0x50
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
-#device de0
+device de0
 
 pseudo-device	loop
 pseudo-device	ether
@@ -71,4 +90,4 @@ options		KTRACE		#kernel tracing
 options		SYSVSHM
 
 options		DDB
-
+options		DB_ELF_SYMBOLS