diff --git a/lib/Makefile b/lib/Makefile
index 5b1efee8a6f3..f3025b1f2361 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -29,19 +29,83 @@
 #
 # Except it appears bind needs to be compiled last
 
-SUBDIR=	${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm \
-	msun libmd ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
-	libtacplus libutil ${_libypclnt}
-SUBDIR+=libalias libarchive ${_libatm} libbegemot ${_libbluetooth} \
-	${_libbsnmp} libbz2 libcalendar libcam libcompat libdevinfo \
-	libdevstat libdisk libdwarf libedit ${_libefi} libexpat libfetch \
-	libftpio libgeom ${_libgpib} ${_libgssapi} ${_librpcsec_gss} libipsec \
-	${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
-	${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
-	${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
-	${_libsmdb} ${_libsmutil} libstand \
-	${_libtelnet} ${_libthr} libthread_db libufs libugidfw libulog \
-	${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \
+SUBDIR_ORDERED=	${_csu} \
+	libc \
+	libbsm \
+	libauditd \
+	libcom_err \
+	libcrypt \
+	libelf \
+	libkvm \
+	msun \
+	libmd \
+	ncurses \
+	${_libnetgraph} \
+	libradius \
+	librpcsvc \
+	libsbuf \
+	libtacplus \
+	libutil \
+	${_libypclnt}
+
+SUBDIR=	${SUBDIR_ORDERED} \
+	libalias \
+	libarchive \
+	${_libatm} \
+	libbegemot \
+	${_libbluetooth} \
+	${_libbsnmp} \
+	libbz2 \
+	libcalendar \
+	libcam \
+	libcompat \
+	libdevinfo \
+	libdevstat \
+	libdisk \
+	libdwarf \
+	libedit \
+	${_libefi} \
+	libexpat \
+	libfetch \
+	libftpio \
+	libgeom \
+	${_libgpib} \
+	${_libgssapi} \
+	${_librpcsec_gss} \
+	libipsec \
+	${_libipx} \
+	libjail \
+	libkiconv \
+	libmagic \
+	libmemstat \
+	${_libmilter} \
+	${_libmp} \
+	${_libncp} \
+	${_libngatm} \
+	libopie \
+	libpam \
+	libpcap \
+	${_libpmc} \
+	libproc \
+	librt \
+	${_libsdp} \
+	${_libsm} \
+	${_libsmb} \
+	${_libsmdb} \
+	${_libsmutil} \
+	libstand \
+	${_libtelnet} \
+	${_libthr} \
+	libthread_db \
+	libufs \
+	libugidfw \
+	libulog \
+	${_libusbhid} \
+	${_libusb} \
+	${_libvgl} \
+	libwrap \
+	liby \
+	libz \
 	${_bind}
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)