diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 61f8ddf2b4b1..b2003371aa62 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -39,11 +39,6 @@ i386/isa/aha1542.c	optional aha
 i386/isa/bt742a.c	optional bt
 i386/isa/ultra14f.c	optional uha
 i386/isa/wd7000.c	optional wds
-scsi/scsiconf.c		optional scbus
-scsi/st.c		optional st
-scsi/sd.c		optional sd
-scsi/cd.c		optional cd
-scsi/ch.c		optional ch
 i386/i386/microtime.s   standard
 i386/isa/lpt.c	optional lpt
 i386/isa/lpa.c	optional lpa
diff --git a/sys/conf/files b/sys/conf/files
index 3e10b9ee2675..163cd2fb1d5e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -214,6 +214,11 @@ ddb/db_trap.c		optional ddb
 ddb/db_variables.c	optional ddb
 ddb/db_watch.c		optional ddb
 ddb/db_write_cmd.c	optional ddb
+scsi/scsiconf.c		optional scsi
+scsi/st.c		optional st
+scsi/sd.c		optional sd
+scsi/cd.c		optional cd
+scsi/ch.c		optional ch
 miscfs/fdesc/fdesc_vfsops.c	optional fdesc
 miscfs/fdesc/fdesc_vnops.c	optional fdesc
 miscfs/kernfs/kernfs_vfsops.c	optional kernfs
diff --git a/sys/conf/files.oldconf b/sys/conf/files.oldconf
index 3e10b9ee2675..163cd2fb1d5e 100644
--- a/sys/conf/files.oldconf
+++ b/sys/conf/files.oldconf
@@ -214,6 +214,11 @@ ddb/db_trap.c		optional ddb
 ddb/db_variables.c	optional ddb
 ddb/db_watch.c		optional ddb
 ddb/db_write_cmd.c	optional ddb
+scsi/scsiconf.c		optional scsi
+scsi/st.c		optional st
+scsi/sd.c		optional sd
+scsi/cd.c		optional cd
+scsi/ch.c		optional ch
 miscfs/fdesc/fdesc_vfsops.c	optional fdesc
 miscfs/fdesc/fdesc_vnops.c	optional fdesc
 miscfs/kernfs/kernfs_vfsops.c	optional kernfs