diff --git a/Makefile.inc1 b/Makefile.inc1
index ed68140b48f9..cab764af97b1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -225,7 +225,6 @@ KNOWN_ARCHES?=	aarch64/arm64 \
 		mipsel/mips \
 		mips64el/mips \
 		mips64/mips \
-		mipsn32el/mips \
 		mipsn32/mips \
 		powerpc \
 		powerpc64/powerpc \
@@ -460,7 +459,7 @@ BFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 BFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
 .if ${TARGET} == "arm"
-.if ${TARGET_ARCH:M*hf*} != ""
+.if ${TARGET_ARCH:Marmv6*} != "" && ${TARGET_CPUTYPE:M*soft*} != ""
 TARGET_ABI=	gnueabihf
 .else
 TARGET_ABI=	gnueabi