diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 7b2589f081a..8a2e4281d55 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.52 1995/11/29 20:07:46 nate Exp $
+#	$Id: GENERIC,v 1.53 1995/12/10 22:14:15 bde Exp $
 #
 
 machine		"i386"
@@ -50,7 +50,7 @@ controller	ahb0
 controller	ahc0
 controller	ahc1
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e3def3d540e..0136547a538 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.219 1995/12/10 10:50:32 julian Exp $
+#	$Id: LINT,v 1.220 1995/12/10 22:09:14 bde 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
@@ -466,7 +466,7 @@ device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 # probed correctly.
 #
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
 controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 660d2487ea8..48cb0529285 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.115 1995/11/18 05:34:00 bde Exp $
+#	$Id: files.i386,v 1.116 1995/11/21 02:50:10 peter Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/aic7xxx_asm.c"			   \
@@ -18,6 +18,7 @@ i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/aic7770.c		optional	ahc	device-driver
 i386/eisa/aha1742.c		optional	ahb	device-driver
+i386/eisa/bt74x.c		optional	bt	device-driver
 i386/eisa/eisaconf.c		optional	eisa
 i386/i386/autoconf.c		standard	device-driver
 i386/i386/conf.c		standard
@@ -68,7 +69,7 @@ i386/isa/aha1542.c		optional	aha	device-driver
 i386/isa/aic6360.c              optional        aic     device-driver
 i386/isa/ata.c			optional	ata	device-driver
 i386/isa/b004.c			optional	bqu	device-driver
-i386/isa/bt742a.c		optional	bt	device-driver
+i386/isa/bt5xx-445.c		optional	bt	device-driver
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx	device-driver
 i386/isa/ctx.c			optional	ctx	device-driver
@@ -181,6 +182,7 @@ i386/isa/wd7000.c		optional	wds	device-driver
 i386/isa/wt.c			optional	wt	device-driver
 i386/scsi/aic7xxx.c		optional	ahc	device-driver	   \
 	dependency	"aic7xxx_seq.h"
+i386/scsi/bt.c			optional	bt	device-driver
 gnu/i386/fpemul/div_small.s	optional	gpl_math_emulate
 gnu/i386/fpemul/errors.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_arith.c	optional	gpl_math_emulate
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7b2589f081a..8a2e4281d55 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.52 1995/11/29 20:07:46 nate Exp $
+#	$Id: GENERIC,v 1.53 1995/12/10 22:14:15 bde Exp $
 #
 
 machine		"i386"
@@ -50,7 +50,7 @@ controller	ahb0
 controller	ahc0
 controller	ahc1
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index e3def3d540e..0136547a538 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.219 1995/12/10 10:50:32 julian Exp $
+#	$Id: LINT,v 1.220 1995/12/10 22:09:14 bde 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
@@ -466,7 +466,7 @@ device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 # probed correctly.
 #
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
 controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index e3def3d540e..0136547a538 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.219 1995/12/10 10:50:32 julian Exp $
+#	$Id: LINT,v 1.220 1995/12/10 22:09:14 bde 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
@@ -466,7 +466,7 @@ device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 # probed correctly.
 #
 
-controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
 controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 660d2487ea8..48cb0529285 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.115 1995/11/18 05:34:00 bde Exp $
+#	$Id: files.i386,v 1.116 1995/11/21 02:50:10 peter Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/aic7xxx_asm.c"			   \
@@ -18,6 +18,7 @@ i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/aic7770.c		optional	ahc	device-driver
 i386/eisa/aha1742.c		optional	ahb	device-driver
+i386/eisa/bt74x.c		optional	bt	device-driver
 i386/eisa/eisaconf.c		optional	eisa
 i386/i386/autoconf.c		standard	device-driver
 i386/i386/conf.c		standard
@@ -68,7 +69,7 @@ i386/isa/aha1542.c		optional	aha	device-driver
 i386/isa/aic6360.c              optional        aic     device-driver
 i386/isa/ata.c			optional	ata	device-driver
 i386/isa/b004.c			optional	bqu	device-driver
-i386/isa/bt742a.c		optional	bt	device-driver
+i386/isa/bt5xx-445.c		optional	bt	device-driver
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx	device-driver
 i386/isa/ctx.c			optional	ctx	device-driver
@@ -181,6 +182,7 @@ i386/isa/wd7000.c		optional	wds	device-driver
 i386/isa/wt.c			optional	wt	device-driver
 i386/scsi/aic7xxx.c		optional	ahc	device-driver	   \
 	dependency	"aic7xxx_seq.h"
+i386/scsi/bt.c			optional	bt	device-driver
 gnu/i386/fpemul/div_small.s	optional	gpl_math_emulate
 gnu/i386/fpemul/errors.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_arith.c	optional	gpl_math_emulate