diff --git a/sys/arch/mips/conf/Makefile.mips b/sys/arch/mips/conf/Makefile.mips
index 195d1ea23768..97d4282644ff 100644
--- a/sys/arch/mips/conf/Makefile.mips
+++ b/sys/arch/mips/conf/Makefile.mips
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mips,v 1.2 2000/12/03 04:52:38 matt Exp $
+#	$NetBSD: Makefile.mips,v 1.3 2000/12/03 05:30:31 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -58,15 +58,20 @@ CWARNFLAGS+=	-Wno-main
 .endif
 GP?=		-G 0
 CFLAGS=		${DEBUG} ${COPTS} ${CWARNFLAGS} ${GP} \
-		-mno-abicalls -mno-half-pic ${ENDIAN}
-AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE ${ENDIAN}
+		-mno-abicalls -mno-half-pic
+AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS+=	-Ttext ${TEXTADDR} -e start ${GP}
-.if (${ENDIAN} == "-EB")
+.if (${MACHINE_ARCH} == "mipseb")
 LINKFLAGS+=	-T ${MIPS}/conf/kern.ldscript.be
+CFLAGS+=	-EB
+AFLAGS+=	-EB
+LD+=		-EB
 .else
 LINKFLAGS+=	-T ${MIPS}/conf/kern.ldscript.le
+CFLAGS+=	-EL
+AFLAGS+=	-EL
+LD+=		-EL
 .endif
-LD+=		${ENDIAN}
 STRIPFLAGS=	-g -X -x
 
 .if exists(${THISMIPS}/conf/Makefile.${MACHINE}.inc)
diff --git a/sys/arch/mipsco/conf/std.mipsco b/sys/arch/mipsco/conf/std.mipsco
index 757d829e511b..1b9ee31c37a9 100644
--- a/sys/arch/mipsco/conf/std.mipsco
+++ b/sys/arch/mipsco/conf/std.mipsco
@@ -1,10 +1,9 @@
-#	$NetBSD: std.mipsco,v 1.2 2000/12/03 04:51:26 matt Exp $
+#	$NetBSD: std.mipsco,v 1.3 2000/12/03 05:30:31 matt Exp $
 
-machine mipsco mips
+machine mipsco mipseb
 
 options	EXEC_ELF32	# exec ELF32 binaries
 options	EXEC_SCRIPT	# exec #! scripts
 
 makeoptions	DEFTEXTADDR="0x80021000"
-makeoptions	ENDIAN="-EB"
 makeoptions	LINKFLAGS="-N"
diff --git a/sys/arch/newsmips/conf/std.newsmips b/sys/arch/newsmips/conf/std.newsmips
index 0d47c7727ac3..7658b38c5fbf 100644
--- a/sys/arch/newsmips/conf/std.newsmips
+++ b/sys/arch/newsmips/conf/std.newsmips
@@ -1,10 +1,9 @@
-#	$NetBSD: std.newsmips,v 1.8 2000/12/03 02:07:06 matt Exp $
+#	$NetBSD: std.newsmips,v 1.9 2000/12/03 05:30:31 matt Exp $
 
-machine newsmips mips
+machine newsmips mipseb
 
 options	EXEC_ELF32	# exec ELF32 binaries
 options	EXEC_SCRIPT	# exec #! scripts
 
-makeoptions	ENDIAN="-EB"
 makeoptions	DEFTEXTADDR="0x80001000"
 makeoptions	LINKFLAGS="-N"
diff --git a/sys/arch/sgimips/conf/std.sgimips b/sys/arch/sgimips/conf/std.sgimips
index bb20bb78b906..6fea43d9a517 100644
--- a/sys/arch/sgimips/conf/std.sgimips
+++ b/sys/arch/sgimips/conf/std.sgimips
@@ -1,6 +1,6 @@
-#	$NetBSD: std.sgimips,v 1.4 2000/12/03 02:07:04 matt Exp $
+#	$NetBSD: std.sgimips,v 1.5 2000/12/03 05:30:31 matt Exp $
 
-machine sgimips mips
+machine sgimips mipseb
 
 options	EXEC_ELF32	# exec ELF32 binaries
 options	EXEC_SCRIPT	# exec #! scripts
@@ -15,5 +15,4 @@ options TLP_MATCH_21041
 options TLP_MATCH_21140
 options TLP_MATCH_21142
 
-makeoptions	ENDIAN="-EB"
 makeoptions	DEFTEXTADDR="0x80002000"