diff --git a/sys/arch/mips/conf/Makefile.mips b/sys/arch/mips/conf/Makefile.mips
index 97d4282644ff..8a69c1b288c2 100644
--- a/sys/arch/mips/conf/Makefile.mips
+++ b/sys/arch/mips/conf/Makefile.mips
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mips,v 1.3 2000/12/03 05:30:31 matt Exp $
+#	$NetBSD: Makefile.mips,v 1.4 2000/12/03 06:04:50 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -121,7 +121,10 @@ SYSTEM_OBJ+=	locore_mips1.o
 .if !empty(IDENT:M-DMIPS3)
 SYSTEM_OBJ+=	locore_mips3.o
 .endif
-SYSTEM_OBJ+=	fp.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
+.if !empty(IDENT:M-DNOFPU)
+SYSTEM_OBJ+=	fp.o
+.endif
+SYSTEM_OBJ+=	param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD?=@rm -f $@
 SYSTEM_LD?=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o ; \
@@ -199,12 +202,31 @@ links:
 	  sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
-SRCS=	${MIPS}/mips/locore.S ${MIPS}/mips/fp.S \
+SRCS=	${MIPS}/mips/locore.S \
 	${THISMIPS}/${MACHINE}/locore_machdep.S \
 	param.c ioconf.c ${CFILES} ${SFILES}
+.if !empty(IDENT:M-DMIPS1)
+SRCS+=	${MIPS}/mips/locore_mips1.S
+.endif
+.if !empty(IDENT:M-DMIPS3)
+SRCS+=	${MIPS}/mips/locore_mips3.S
+.endif
+.if !empty(IDENT:M-DNOFPU)
+SRCS+=	${MIPS}/mips/fp.S
+.endif
+
 depend: .depend
 .depend: ${SRCS} assym.h param.c
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MIPS}/mips/locore.S ${MIPS}/mips/fp.S
+.if !empty(IDENT:M-DMIPS1)
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${MIPS}/mips/locore_mips1.S
+.endif
+.if !empty(IDENT:M-DMIPS3)
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${MIPS}/mips/locore_mips3.S
+.endif
+.if !empty(IDENT:M-DNOFPU)
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${MIPS}/mips/fp.S
+.endif
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${THISMIPS}/${MACHINE}/locore_machdep.S
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if (${SFILES} != "")