diff --git a/sbin/Makefile b/sbin/Makefile
index 457076346b8e..d346a6c2da0f 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -9,10 +9,8 @@ SUBDIR= adjkerntz badsect clri disklabel dmesg dump dumpfs dumplfs \
 	nologin ping quotacheck reboot restore route savecore shutdown \
 	slattach startslip swapon sysinstall tunefs umount
 
-.if	make(clean) || make(cleandir)
-SUBDIR+=comcontrol fdisk ft mount_msdos
-.elif	${MACHINE} == "i386"
-SUBDIR+=comcontrol fdisk ft mount_msdos
+.if exists(${.CURDIR}/${MACHINE})
+SUBDIR+= ${MACHINE}
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sbin/i386/Makefile b/sbin/i386/Makefile
index c480c160a4f6..7d5c9ce1a240 100644
--- a/sbin/i386/Makefile
+++ b/sbin/i386/Makefile
@@ -1,5 +1,6 @@
-#	$Id$
+#	$Id: Makefile,v 1.1.1.1 1994/12/02 23:22:59 wollman Exp $
 
-SUBDIR=	cxconfig
+SUBDIR=	comcontrol fdisk ft mount_msdos
+#NOTYET: cxconfig
 
 .include <bsd.subdir.mk>
diff --git a/sbin/i386/Makefile.inc b/sbin/i386/Makefile.inc
new file mode 100644
index 000000000000..c961f8568307
--- /dev/null
+++ b/sbin/i386/Makefile.inc
@@ -0,0 +1,3 @@
+#	$Id$
+
+.include "${.CURDIR}/../../Makefile.inc"