Index: head/sbin/Makefile
===================================================================
--- head/sbin/Makefile	(revision 114758)
+++ head/sbin/Makefile	(revision 114759)
@@ -1,120 +1,115 @@
 #	@(#)Makefile	8.5 (Berkeley) 3/31/94
 # $FreeBSD$
 
 # XXX MISSING:		icheck ncheck
 
 SUBDIR=	adjkerntz \
 	atacontrol \
 	atm \
 	badsect \
+	bsdlabel \
 	camcontrol \
 	ccdconfig \
 	clri \
 	comcontrol \
 	conscontrol \
 	devfs \
 	dhclient \
 	dmesg \
 	dump \
 	dumpfs \
 	dumpon \
 	fsck \
 	fsck_ffs \
 	fsck_msdosfs \
 	fsdb \
 	fsirand \
 	gbde \
 	growfs \
 	ifconfig \
 	init \
 	ip6fw \
 	ipfw \
 	kldconfig \
 	kldload \
 	kldstat \
 	kldunload \
 	ldconfig \
 	md5 \
 	mdconfig \
 	mdmfs \
 	mknod \
 	mksnap_ffs \
 	mount \
 	mount_cd9660 \
 	mount_ext2fs \
 	mount_msdosfs \
 	mount_nfs \
 	mount_ntfs \
 	mount_nullfs \
 	mount_portalfs \
 	mount_std \
 	mount_udf \
 	mount_umapfs \
 	mount_unionfs \
 	natd \
 	newfs \
 	newfs_msdos \
 	nfsiod \
 	nologin \
 	nos-tun \
 	ping \
 	ping6 \
 	quotacheck \
 	raidctl \
 	rcorder \
 	reboot \
 	restore \
 	route \
 	routed \
 	rtsol \
 	savecore \
 	shutdown \
 	slattach \
 	spppcontrol \
 	startslip \
 	swapon \
 	sysctl \
 	tunefs \
 	umount \
 	vinum
 
 .if !defined(NO_CXX)
 SUBDIR+=devd
 .endif
 
 .if !defined(NO_IPFILTER)
 SUBDIR+=ipf \
 	ipfs \
 	ipfstat \
 	ipmon \
 	ipnat
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=cxconfig \
 	mount_nwfs \
 	mount_smbfs
-SUBDIR+=disklabel
 .if ${MACHINE} == "pc98"
 SUBDIR+=fdisk_pc98
 .else
 SUBDIR+=fdisk
 .endif
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"
 SUBDIR+=fdisk \
-	disklabel \
 	gpt \
 	mca
-.endif
-
-.if ${MACHINE_ARCH} == "alpha"
-SUBDIR+=disklabel
 .endif
 
 .if ${MACHINE_ARCH} == "sparc64"
 SUBDIR+=sunlabel
 .endif
 
 .include <bsd.subdir.mk>
Index: head/sbin/bsdlabel/Makefile
===================================================================
--- head/sbin/bsdlabel/Makefile	(revision 114758)
+++ head/sbin/bsdlabel/Makefile	(revision 114759)
@@ -1,24 +1,34 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/17/94
 # $FreeBSD$
 
 PROG=	bsdlabel
 SRCS=	bsdlabel.c geom_bsd_enc.c
 #MAN+=	bsdlabel.5
 MAN+=	bsdlabel.8
 
+.if ${MACHINE_ARCH} == "i386"
+LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
+MLINKS+= bsdlabel.8 disklabel.8
+.endif
+
+.if ${MACHINE_ARCH} == "alpha"
+LINKS=	${BINDIR}/bsdlabel ${BINDIR}/disklabel
+MLINKS+= bsdlabel.8 disklabel.8
+.endif
+
 DDADD=  ${LIBGEOM}
 LDADD=  -lgeom -lbsdxml -lsbuf
 
 .if ${MACHINE} == "pc98"
 CFLAGS+= -DPC98
 .endif
 
 .PATH:  ${.CURDIR}/../../sys/geom
 
 .include <bsd.prog.mk>
 
 test:	${PROG}
 	sh ${.CURDIR}/runtest.sh
 
 testx:	${PROG}
 	sh -x ${.CURDIR}/runtest.sh