diff --git a/sbin/Makefile b/sbin/Makefile
index 726cbdbc6aa2..e175684da44e 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -2,11 +2,17 @@
 
 # XXX MISSING:		fsdb icheck ncheck
 # XXX NEEDS CONVERSION:	scsiformat
-SUBDIR= adjkerntz badsect clri comcontrol disklabel dmesg dump dumpfs dumplfs \
-	fdisk fsck ifconfig init mknod modload modunload mount mount_cd9660 \
-	mount_fdesc mount_kernfs mount_lfs mount_nfs mount_null mount_msdos \
-	mount_portal mount_procfs mount_umap mount_union mountd newfs newlfs \
-	nfsd nfsiod nologin ping quotacheck reboot restore route savecore \
-	shutdown slattach startslip swapon tunefs umount
+SUBDIR= adjkerntz badsect clri disklabel dmesg dump dumpfs dumplfs \
+	fsck ifconfig init mknod modload modunload mount mount_cd9660 \
+	mount_fdesc mount_kernfs mount_lfs mount_nfs mount_null mount_portal \
+	mount_procfs mount_umap mount_union mountd newfs newlfs nfsd nfsiod \
+	nologin ping quotacheck reboot restore route savecore shutdown \
+	slattach startslip swapon tunefs umount
+
+.if	make(clean) || make(cleandir)
+SUBDIR+=comcontrol fdisk mount_msdos
+.elif	${MACHINE} == "i386"
+SUBDIR+=comcontrol fdisk mount_msdos
+.endif
 
 .include <bsd.subdir.mk>