diff --git a/sbin/Makefile b/sbin/Makefile
index d33d80c86897..3b1b72917788 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -82,12 +82,16 @@ SUBDIR=	adjkerntz \
 	umount \
 	vinum
 
-.if ${MACHINE_ARCH} == i386
-SUBDIR+=	kget mount_nwfs
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=cxconfig \
+	fdisk \
+	kget \
+	mount_nwfs \
+	nextboot
 .endif
 
-.if exists(${.CURDIR}/${MACHINE})
-SUBDIR+= ${MACHINE}
+.if ${MACHINE_ARCH} == "ia64"
+SUBDIR+=fdisk
 .endif
 
 .include <bsd.subdir.mk>