diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index a09a2e9d1d8..fe55edb3299 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.55 1994/03/11 10:31:04 swallace Exp $
+#	$Id: LINT,v 1.56 1994/03/11 22:17:24 swallace Exp $
 #
 
 machine		"i386"
@@ -26,7 +26,7 @@ options		"COM_MULTIPORT"		#Multiport support in sys/isa/sio.c
 options         "FIFO_TRIGGER=FIFO_TRIGGER_1"   #Use this fifo value in sio.c
 
 options		"COMPAT_43"		#compatible with BSD 4.3
-options		"SYMTAB_SPACE=104705"	#This kernel needs LOTS of symtable
+options		"SYMTAB_SPACE=112433"	#This kernel needs LOTS of symtable
 options		GATEWAY			#internetwork gateway
 options		KTRACE			#kernel tracing
 
@@ -139,7 +139,7 @@ device		lpa1	at isa? port "IO_LPT2" tty
 # interrupt driven parallel printer port driver
 device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
 # Driver for Mutsumi CD-ROM players
-device		mcd0	at isa? port 0x300 bio irq 10 vector mcdint
+device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
 # Driver for Logitech and ATI inport bus mice
 device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index a59b39a0e70..b6f714c1f4f 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_ep.c,v 1.6 1994/01/26 20:18:56 nate Exp $
+ *	$Id: if_ep.c,v 1.7 1994/02/03 11:51:06 davidg Exp $
  */
 /*
  * TODO:
@@ -773,7 +773,7 @@ epioctl(ifp, cmd, data)
 			else {
 				ifp->if_flags &= ~IFF_RUNNING;
 				bcopy((caddr_t) ina->x_host.c_host,
-					(caddr_t)sc->arpcom.ns_addr
+					(caddr_t)sc->arpcom.ac_enaddr,
 					sizeof(sc->arpcom.ac_enaddr));
 			}
 			epinit(ifp->if_unit);
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index a09a2e9d1d8..fe55edb3299 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.55 1994/03/11 10:31:04 swallace Exp $
+#	$Id: LINT,v 1.56 1994/03/11 22:17:24 swallace Exp $
 #
 
 machine		"i386"
@@ -26,7 +26,7 @@ options		"COM_MULTIPORT"		#Multiport support in sys/isa/sio.c
 options         "FIFO_TRIGGER=FIFO_TRIGGER_1"   #Use this fifo value in sio.c
 
 options		"COMPAT_43"		#compatible with BSD 4.3
-options		"SYMTAB_SPACE=104705"	#This kernel needs LOTS of symtable
+options		"SYMTAB_SPACE=112433"	#This kernel needs LOTS of symtable
 options		GATEWAY			#internetwork gateway
 options		KTRACE			#kernel tracing
 
@@ -139,7 +139,7 @@ device		lpa1	at isa? port "IO_LPT2" tty
 # interrupt driven parallel printer port driver
 device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
 # Driver for Mutsumi CD-ROM players
-device		mcd0	at isa? port 0x300 bio irq 10 vector mcdint
+device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
 # Driver for Logitech and ATI inport bus mice
 device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index a09a2e9d1d8..fe55edb3299 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.55 1994/03/11 10:31:04 swallace Exp $
+#	$Id: LINT,v 1.56 1994/03/11 22:17:24 swallace Exp $
 #
 
 machine		"i386"
@@ -26,7 +26,7 @@ options		"COM_MULTIPORT"		#Multiport support in sys/isa/sio.c
 options         "FIFO_TRIGGER=FIFO_TRIGGER_1"   #Use this fifo value in sio.c
 
 options		"COMPAT_43"		#compatible with BSD 4.3
-options		"SYMTAB_SPACE=104705"	#This kernel needs LOTS of symtable
+options		"SYMTAB_SPACE=112433"	#This kernel needs LOTS of symtable
 options		GATEWAY			#internetwork gateway
 options		KTRACE			#kernel tracing
 
@@ -139,7 +139,7 @@ device		lpa1	at isa? port "IO_LPT2" tty
 # interrupt driven parallel printer port driver
 device		lpt0	at isa? port "IO_LPT3" tty irq 7 vector lptintr
 # Driver for Mutsumi CD-ROM players
-device		mcd0	at isa? port 0x300 bio irq 10 vector mcdint
+device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
 # Driver for Logitech and ATI inport bus mice
 device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index a59b39a0e70..b6f714c1f4f 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_ep.c,v 1.6 1994/01/26 20:18:56 nate Exp $
+ *	$Id: if_ep.c,v 1.7 1994/02/03 11:51:06 davidg Exp $
  */
 /*
  * TODO:
@@ -773,7 +773,7 @@ epioctl(ifp, cmd, data)
 			else {
 				ifp->if_flags &= ~IFF_RUNNING;
 				bcopy((caddr_t) ina->x_host.c_host,
-					(caddr_t)sc->arpcom.ns_addr
+					(caddr_t)sc->arpcom.ac_enaddr,
 					sizeof(sc->arpcom.ac_enaddr));
 			}
 			epinit(ifp->if_unit);