diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 1a122816f92d..ac375cd279c3 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.21 1994/02/13 20:37:32 jkh Exp $
+#	$Id: Makefile.i386,v 1.22 1994/02/17 06:51:15 rgrimes Exp $
 #
 # Makefile for FreeBSD
 #
@@ -55,7 +55,7 @@ SYSTEM_OBJS=locore.o exception.o swtch.o support.o ${OBJS} param.o \
 	ioconf.o conf.o machdep.o
 SYSTEM_DEP=Makefile symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= 	@echo loading $@; rm -f $@
-SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X vers.o ${SYSTEM_OBJS}
+SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; symorder symbols.sort $@; \
 	${DBSYM} -fT ${LOAD_ADDRESS} $@; ${STRIP} -x $@; size $@; chmod 755 $@
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 1a122816f92d..ac375cd279c3 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.21 1994/02/13 20:37:32 jkh Exp $
+#	$Id: Makefile.i386,v 1.22 1994/02/17 06:51:15 rgrimes Exp $
 #
 # Makefile for FreeBSD
 #
@@ -55,7 +55,7 @@ SYSTEM_OBJS=locore.o exception.o swtch.o support.o ${OBJS} param.o \
 	ioconf.o conf.o machdep.o
 SYSTEM_DEP=Makefile symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= 	@echo loading $@; rm -f $@
-SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X vers.o ${SYSTEM_OBJS}
+SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; symorder symbols.sort $@; \
 	${DBSYM} -fT ${LOAD_ADDRESS} $@; ${STRIP} -x $@; size $@; chmod 755 $@
 
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 7da64580d915..518caed6a4d6 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.26 1994/02/27 21:53:54 phk Exp $
+#	$Id: files.i386,v 1.27 1994/03/11 10:31:05 swallace Exp $
 #
 i386/i386/autoconf.c		standard		device-driver
 i386/i386/cons.c		standard
@@ -39,6 +39,7 @@ i386/isa/syscons.c		optional	sc	device-driver
 i386/isa/pccons.c		optional	pc	device-driver
 i386/isa/psm.c			optional	psm	device-driver
 i386/isa/sb.c			optional	sb	device-driver
+i386/isa/scd.c			optional	scd	device-driver
 i386/isa/sg.c			optional	sg	device-driver
 i386/isa/sio.c			optional	sio	device-driver
 i386/isa/sound/adlib_card.c	optional	snd	device-driver
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 1a122816f92d..ac375cd279c3 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.21 1994/02/13 20:37:32 jkh Exp $
+#	$Id: Makefile.i386,v 1.22 1994/02/17 06:51:15 rgrimes Exp $
 #
 # Makefile for FreeBSD
 #
@@ -55,7 +55,7 @@ SYSTEM_OBJS=locore.o exception.o swtch.o support.o ${OBJS} param.o \
 	ioconf.o conf.o machdep.o
 SYSTEM_DEP=Makefile symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= 	@echo loading $@; rm -f $@
-SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X vers.o ${SYSTEM_OBJS}
+SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; symorder symbols.sort $@; \
 	${DBSYM} -fT ${LOAD_ADDRESS} $@; ${STRIP} -x $@; size $@; chmod 755 $@
 
diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386
index 9766f9af4b69..2b3061a89d25 100644
--- a/sys/i386/conf/devices.i386
+++ b/sys/i386/conf/devices.i386
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.i386,v 1.4 1993/10/26 21:27:07 nate Exp $
+#	$Id: devices.i386,v 1.5 1994/01/04 20:09:28 nate Exp $
 #
 wd	0
 dk	1
@@ -10,3 +10,4 @@ sd	4
 st	5
 cd	6
 mcd	7
+scd	8
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 7da64580d915..518caed6a4d6 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.26 1994/02/27 21:53:54 phk Exp $
+#	$Id: files.i386,v 1.27 1994/03/11 10:31:05 swallace Exp $
 #
 i386/i386/autoconf.c		standard		device-driver
 i386/i386/cons.c		standard
@@ -39,6 +39,7 @@ i386/isa/syscons.c		optional	sc	device-driver
 i386/isa/pccons.c		optional	pc	device-driver
 i386/isa/psm.c			optional	psm	device-driver
 i386/isa/sb.c			optional	sb	device-driver
+i386/isa/scd.c			optional	scd	device-driver
 i386/isa/sg.c			optional	sg	device-driver
 i386/isa/sio.c			optional	sio	device-driver
 i386/isa/sound/adlib_card.c	optional	snd	device-driver