diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 2eb3e88f2eee..6f11b9e5336b 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.62 1999/04/25 04:04:24 kato Exp $
+#	$Id: Makefile.pc98,v 1.63 1999/05/09 04:26:06 kato Exp $
 #
 # Makefile for FreeBSD
 #
@@ -19,10 +19,11 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	400014
+%VERSREQ=	400016
 
+# Can be overridden by makeoptions or /etc/make.conf
+KERNEL?=	kernel
 KERNFORMAT?=	elf
-
 #STD8X16FONT?=	iso
 
 .if exists(./@/.)
@@ -88,7 +89,6 @@ SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
-SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET}
 
 .if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
@@ -108,12 +108,6 @@ SYSTEM_LD_TAIL= @size -elf ${.TARGET} ; chmod 755 ${.TARGET}
 SYSTEM_DEP+= $S/i386/conf/kernel.script
 .endif
 
-.if defined(DEBUG)
-FULLKERNEL=	${KERNEL}.debug
-.else
-FULLKERNEL=	${KERNEL}
-.endif
-
 %BEFORE_DEPEND
 
 %OBJS
@@ -124,10 +118,29 @@ FULLKERNEL=	${KERNEL}
 
 %MFILES
 
-%LOAD
-
 %CLEAN
 
+all:	${KERNEL}
+
+.if !defined(DEBUG)
+FULLKERNEL=	${KERNEL}
+.else
+FULLKERNEL=	${KERNEL}.debug
+${KERNEL}:	${FULLKERNEL}
+.if ${KERNFORMAT} == "elf"
+	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
+.else
+	cp ${FULLKERNEL} ${KERNEL}
+	strip -d ${KERNEL}
+.endif
+.endif
+
+${FULLKERNEL}:	${SYSTEM_DEP} vers.o
+	@rm -f ${.TARGET}
+	@echo linking ${.TARGET}
+	${SYSTEM_LD}
+	${SYSTEM_LD_TAIL}
+
 .if !exists(.depend)
 ${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
 .endif
@@ -174,7 +187,6 @@ setdef1.o: setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdef0.c setdef1.c setdefs.h: ${OBJS}
-	@echo generating linker set emulation glue for ELF
 	@gensetdefs ${OBJS}
 
 # this rule stops ./assym.s in .depend from causing problems
@@ -206,9 +218,9 @@ cleandepend:
 	rm -f .depend
 
 links:
-	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
+	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
+	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
@@ -216,16 +228,6 @@ links:
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
-.if defined(DEBUG)
-${KERNEL}:	${FULLKERNEL}
-.if ${KERNFORMAT} == "elf"
-	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
-.else
-	cp ${FULLKERNEL} ${KERNEL}
-	strip -d kernel
-.endif
-.endif
-
 install install.debug:
 	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
 		echo "You must first build a kernel first." ; \
@@ -238,8 +240,8 @@ install install.debug:
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
-		if [ -f /var/db/kvm_kernel.db ] ; then \
-			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
+		if [ -f /var/db/kvm_${KERNEL}.db ] ; then \
+			mv -f /var/db/kvm_${KERNEL}.db /var/db/kvm_${KERNEL}.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 8631743c9f4a..1996d5479565 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.73 1999/04/25 04:03:22 kato Exp $
+#	$Id: GENERIC98,v 1.74 1999/04/25 05:59:02 kato Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
@@ -54,8 +54,6 @@ options		COM_MULTIPORT
 #	IBM-PC HDD support
 #options	COMPAT_ATDISK
 
-config		kernel	root on wd0
-
 # To make an SMP kernel, the next two are needed
 #options	SMP			# Symmetric MultiProcessor Kernel
 #options	APIC_IO			# Symmetric (APIC) I/O
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 8631743c9f4a..1996d5479565 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.73 1999/04/25 04:03:22 kato Exp $
+#	$Id: GENERIC98,v 1.74 1999/04/25 05:59:02 kato Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
@@ -54,8 +54,6 @@ options		COM_MULTIPORT
 #	IBM-PC HDD support
 #options	COMPAT_ATDISK
 
-config		kernel	root on wd0
-
 # To make an SMP kernel, the next two are needed
 #options	SMP			# Symmetric MultiProcessor Kernel
 #options	APIC_IO			# Symmetric (APIC) I/O
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index 2eb3e88f2eee..6f11b9e5336b 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.62 1999/04/25 04:04:24 kato Exp $
+#	$Id: Makefile.pc98,v 1.63 1999/05/09 04:26:06 kato Exp $
 #
 # Makefile for FreeBSD
 #
@@ -19,10 +19,11 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	400014
+%VERSREQ=	400016
 
+# Can be overridden by makeoptions or /etc/make.conf
+KERNEL?=	kernel
 KERNFORMAT?=	elf
-
 #STD8X16FONT?=	iso
 
 .if exists(./@/.)
@@ -88,7 +89,6 @@ SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
-SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET}
 
 .if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
@@ -108,12 +108,6 @@ SYSTEM_LD_TAIL= @size -elf ${.TARGET} ; chmod 755 ${.TARGET}
 SYSTEM_DEP+= $S/i386/conf/kernel.script
 .endif
 
-.if defined(DEBUG)
-FULLKERNEL=	${KERNEL}.debug
-.else
-FULLKERNEL=	${KERNEL}
-.endif
-
 %BEFORE_DEPEND
 
 %OBJS
@@ -124,10 +118,29 @@ FULLKERNEL=	${KERNEL}
 
 %MFILES
 
-%LOAD
-
 %CLEAN
 
+all:	${KERNEL}
+
+.if !defined(DEBUG)
+FULLKERNEL=	${KERNEL}
+.else
+FULLKERNEL=	${KERNEL}.debug
+${KERNEL}:	${FULLKERNEL}
+.if ${KERNFORMAT} == "elf"
+	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
+.else
+	cp ${FULLKERNEL} ${KERNEL}
+	strip -d ${KERNEL}
+.endif
+.endif
+
+${FULLKERNEL}:	${SYSTEM_DEP} vers.o
+	@rm -f ${.TARGET}
+	@echo linking ${.TARGET}
+	${SYSTEM_LD}
+	${SYSTEM_LD_TAIL}
+
 .if !exists(.depend)
 ${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
 .endif
@@ -174,7 +187,6 @@ setdef1.o: setdef1.c setdefs.h
 	${NORMAL_C}
 
 setdef0.c setdef1.c setdefs.h: ${OBJS}
-	@echo generating linker set emulation glue for ELF
 	@gensetdefs ${OBJS}
 
 # this rule stops ./assym.s in .depend from causing problems
@@ -206,9 +218,9 @@ cleandepend:
 	rm -f .depend
 
 links:
-	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
+	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
+	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
@@ -216,16 +228,6 @@ links:
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
-.if defined(DEBUG)
-${KERNEL}:	${FULLKERNEL}
-.if ${KERNFORMAT} == "elf"
-	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
-.else
-	cp ${FULLKERNEL} ${KERNEL}
-	strip -d kernel
-.endif
-.endif
-
 install install.debug:
 	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
 		echo "You must first build a kernel first." ; \
@@ -238,8 +240,8 @@ install install.debug:
 	PATH=$${PATH}:/sbin:/usr/sbin; \
 	if [ `sysctl -n kern.bootfile` = ${DESTDIR}/${KERNEL} ] ; then \
 		sysctl -w kern.bootfile=${DESTDIR}/${KERNEL}.old ; \
-		if [ -f /var/db/kvm_kernel.db ] ; then \
-			mv -f /var/db/kvm_kernel.db /var/db/kvm_kernel.old.db ; \
+		if [ -f /var/db/kvm_${KERNEL}.db ] ; then \
+			mv -f /var/db/kvm_${KERNEL}.db /var/db/kvm_${KERNEL}.old.db ; \
 		fi \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \