diff --git a/lib/Makefile b/lib/Makefile
index e84d25d282fa..ae9f0fb2c33b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -31,8 +31,10 @@ SUBDIR=	${_csu} libcom_err libcrypt msun libmd \
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
 _csu=csu/${MACHINE_ARCH}-${OBJFORMAT}
-.elif exists(${.CURDIR}/csu/${MACHINE_ARCH})
+.elif exists(${.CURDIR}/csu/${MACHINE_ARCH}/Makefile)
 _csu=csu/${MACHINE_ARCH}
+.else
+_csu=csu
 .endif
 
 .if !defined(NOLIBC_R)
@@ -51,6 +53,7 @@ _libvgl=	libvgl
 
 .if ${MACHINE_ARCH} == "alpha"
 _libio=		libio
+_compat=	compat
 .endif
 
 .if defined(RELEASEDIR) || \