diff --git a/Makefile b/Makefile
index 277235193e90..b8b0909339c9 100644
--- a/Makefile
+++ b/Makefile
@@ -509,15 +509,15 @@ TARGET_ARCHES_${target}?= ${target}
 MAKE_PARAMS_riscv?=	CROSS_TOOLCHAIN=riscv64-gcc
 .if !defined(MAKE_OBSOLETE_GCC)
 OBSOLETE_GCC_TARGETS=${_OBSOLETE_GCC_TARGETS}
-MAKE_PARAMS_mips?=	CROSS_TOOLCHAIN=mips-gcc
-MAKE_PARAMS_powerpc?=	CROSS_TOOLCHAIN=powerpc64-gcc
-MAKE_PARAMS_sparc64?=	CROSS_TOOLCHAIN=sparc64-gcc
+MAKE_PARAMS_mips?=	CROSS_TOOLCHAIN=mips-gcc6
+MAKE_PARAMS_powerpc?=	CROSS_TOOLCHAIN=powerpc64-gcc6
+MAKE_PARAMS_sparc64?=	CROSS_TOOLCHAIN=sparc64-gcc6
 .endif
 
-TOOLCHAINS_mips=	mips
-TOOLCHAINS_powerpc=	powerpc64
-TOOLCHAINS_riscv=	riscv64
-TOOLCHAINS_sparc64=	sparc64
+TOOLCHAINS_mips=	mips-gcc6
+TOOLCHAINS_powerpc=	powerpc64-gcc6
+TOOLCHAINS_riscv=	riscv64-gcc
+TOOLCHAINS_sparc64=	sparc64-gcc6
 
 # Remove architectures only supported by external toolchain from
 # universe if required toolchain packages are missing. riscv requires
@@ -526,12 +526,12 @@ TOOLCHAINS_sparc64=	sparc64
 .for target in riscv ${OBSOLETE_GCC_TARGETS}
 .if ${_UNIVERSE_TARGETS:M${target}}
 .for toolchain in ${TOOLCHAINS_${target}}
-.if !exists(/usr/local/share/toolchains/${toolchain}-gcc.mk)
+.if !exists(/usr/local/share/toolchains/${toolchain}.mk)
 _UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:N${target}}
 universe: universe_${toolchain}_skip .PHONY
 universe_epilogue: universe_${toolchain}_skip .PHONY
 universe_${toolchain}_skip: universe_prologue .PHONY
-	@echo ">> ${target} skipped - install ${toolchain}-xtoolchain-gcc port or package to build"
+	@echo ">> ${target} skipped - install ${toolchain} port or package to build"
 .endif
 .endfor
 .endif