diff --git a/lib/Makefile b/lib/Makefile
index 23066c56a6c4..1d009f5ae922 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -27,7 +27,7 @@ SUBDIR=	${_csu} libcom_err libcrypt libkvm msun libmd \
 	libedit libfetch libform libftpio ${_libgnumalloc} ${_libio} libipsec \
 	libipx libisc libmenu ${_libmp} ${_libncp} \
 	libnetgraph libopie libpam libpanel libpcap \
-	${_libresolv} libsmb ${_libsmdb} ${_libsmutil} \
+	${_libresolv} ${_libsmb} ${_libsmdb} ${_libsmutil} \
 	libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
@@ -59,6 +59,7 @@ _libsmutil=	libsmutil
 .if ${MACHINE_ARCH} == "i386"
 _compat=	compat
 _libncp=	libncp
+_libsmb=	libsmb
 _libvgl=	libvgl
 .endif
 
diff --git a/sbin/Makefile b/sbin/Makefile
index 16c31c0155b9..44298c394016 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -53,7 +53,6 @@ SUBDIR=	adjkerntz \
 	mount_ntfs \
 	mount_nullfs \
 	mount_portalfs \
-	mount_smbfs \
 	mount_std \
 	mount_umapfs \
 	mount_unionfs \
@@ -87,6 +86,7 @@ SUBDIR=	adjkerntz \
 SUBDIR+=cxconfig \
 	kget \
 	mount_nwfs \
+	mount_smbfs \
 	nextboot
 .if ${MACHINE} == "pc98"
 SUBDIR+=fdisk_pc98
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 1498784772b2..955d9a025b20 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -134,7 +134,6 @@ SUBDIR=	apply \
 	sed \
 	shar \
 	showmount \
-	smbutil \
 	sockstat \
 	soelim \
 	split \
@@ -223,6 +222,7 @@ SUBDIR+=ar \
 	ranlib \
 	sasc \
 	size \
+	smbutil \
 	strings \
 	strip
 .endif