diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 820855c86a75..ce586d8afed4 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -13,11 +13,7 @@
 #
 
 PACKAGE=	clibs
-.if ${MACHINE_CPUARCH} == "i386"
-ARCH_SUBDIR= i387
-.else
-ARCH_SUBDIR= ${MACHINE_CPUARCH}
-.endif
+ARCH_SUBDIR=	${MACHINE_CPUARCH:S/i386/i387/}
 
 .include "${ARCH_SUBDIR}/Makefile.inc"