diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index ee4094dee3f6..b5cd5023ac0a 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.21 1995/03/16 18:11:24 bde Exp $
+ *	$Id: autoconf.c,v 1.22 1995/04/10 07:44:25 phk Exp $
  */
 
 /*
@@ -118,6 +118,27 @@ find_cdrom_root()
 }
 #endif
 
+#include "scbus.h"
+#if NSCBUS > 0
+      #include <scsi/scsiconf.h>
+#endif
+
+void
+configure_start()
+{
+#if NSCBUS > 0
+	scsi_configure_start();
+#endif
+}
+
+void
+configure_finish()
+{
+#if NSCBUS > 0
+	scsi_configure_finish();
+#endif
+}
+
 /*
  * Determine i/o configuration for a machine.
  */
@@ -125,6 +146,8 @@ void
 configure()
 {
 
+	configure_start();
+
 #if NISA > 0
 	isa_configure();
 #endif
@@ -133,6 +156,8 @@ configure()
 	pci_configure();
 #endif
 
+	configure_finish();
+
 #ifdef CD9660
 #ifdef BOOTCDROM
 	if (!mountroot) {
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index ee4094dee3f6..b5cd5023ac0a 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.21 1995/03/16 18:11:24 bde Exp $
+ *	$Id: autoconf.c,v 1.22 1995/04/10 07:44:25 phk Exp $
  */
 
 /*
@@ -118,6 +118,27 @@ find_cdrom_root()
 }
 #endif
 
+#include "scbus.h"
+#if NSCBUS > 0
+      #include <scsi/scsiconf.h>
+#endif
+
+void
+configure_start()
+{
+#if NSCBUS > 0
+	scsi_configure_start();
+#endif
+}
+
+void
+configure_finish()
+{
+#if NSCBUS > 0
+	scsi_configure_finish();
+#endif
+}
+
 /*
  * Determine i/o configuration for a machine.
  */
@@ -125,6 +146,8 @@ void
 configure()
 {
 
+	configure_start();
+
 #if NISA > 0
 	isa_configure();
 #endif
@@ -133,6 +156,8 @@ configure()
 	pci_configure();
 #endif
 
+	configure_finish();
+
 #ifdef CD9660
 #ifdef BOOTCDROM
 	if (!mountroot) {
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index e9be160fbc65..bf02cf5b9c7d 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -42,7 +42,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	5.8 (Berkeley) 5/12/91
- *	$Id: conf.c,v 1.81 1995/04/09 15:49:56 jkh Exp $
+ *	$Id: conf.c,v 1.82 1995/04/10 20:40:11 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -123,7 +123,7 @@ d_psize_t	wdsize;
 #endif
 
 #include "worm.h"
-#if WORM > 0
+#if NWORM > 0
 d_open_t	wormopen;
 d_close_t	wormclose;
 d_strategy_t	wormstrategy;
@@ -139,6 +139,23 @@ d_psize_t	wormsize;
 #define	wormsize		zerosize
 #endif
 
+#include "sctarg.h"
+#if NSCTARG > 0
+d_open_t	sctargopen;
+d_close_t	sctargclose;
+d_strategy_t	sctargstrategy;
+d_ioctl_t	sctargioctl;
+d_dump_t	sctargdump;
+d_psize_t	sctargsize;
+#else
+#define	sctargopen		nxopen
+#define	sctargclose		nxclose
+#define	sctargstrategy	nxstrategy
+#define	sctargioctl		nxioctl
+#define	sctargdump		nxdump
+#define	sctargsize		zerosize
+#endif
+
 #include "pt.h"
 #if NPT > 0
 d_open_t	ptopen;
@@ -1194,6 +1211,9 @@ struct cdevsw	cdevsw[] =
 	  nxwrite, nxioctl, nxstop,				   /* Talisman*/
 	  nxreset, nxdevtotty, nxselect,
 	  nxmmap, NULL },
+	{ sctargopen,	sctargclose,	rawread,	rawwrite,	/*65*/
+	  sctargioctl,	nostop,		nullreset,	nodevtotty,/* sctarg */
+	  seltrue,	nommap,		sctargstrategy },
 };
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);