diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index 320a5a4d473..5f1cddcde66 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
-ARCH= ${MACHINE_ARCH:S/i386/i386-elf/}
-.if exists(${.CURDIR}/${ARCH})
-SUBDIR+= ${ARCH}
+.if exists(${.CURDIR}/${MACHINE_ARCH})
+SUBDIR+= ${MACHINE_ARCH}
 .else
 SUBDIR+= ${MACHINE_CPUARCH}
 .endif
diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386/Makefile
similarity index 100%
rename from lib/csu/i386-elf/Makefile
rename to lib/csu/i386/Makefile
diff --git a/lib/csu/i386-elf/crt1_c.c b/lib/csu/i386/crt1_c.c
similarity index 100%
rename from lib/csu/i386-elf/crt1_c.c
rename to lib/csu/i386/crt1_c.c
diff --git a/lib/csu/i386-elf/crt1_s.S b/lib/csu/i386/crt1_s.S
similarity index 100%
rename from lib/csu/i386-elf/crt1_s.S
rename to lib/csu/i386/crt1_s.S
diff --git a/lib/csu/i386-elf/crti.S b/lib/csu/i386/crti.S
similarity index 100%
rename from lib/csu/i386-elf/crti.S
rename to lib/csu/i386/crti.S
diff --git a/lib/csu/i386-elf/crtn.S b/lib/csu/i386/crtn.S
similarity index 100%
rename from lib/csu/i386-elf/crtn.S
rename to lib/csu/i386/crtn.S