Index: usr.sbin/efibootmgr/Makefile
===================================================================
--- usr.sbin/efibootmgr/Makefile
+++ usr.sbin/efibootmgr/Makefile
@@ -11,4 +11,7 @@
 
 LIBADD= efivar geom
 
+LNKS=	${BINDIR}/efibootmgr ${BINDIR}/uefibootmgr
+MLINKS=	efibootmgr.8 uefibootmgr.8
+
 .include <bsd.prog.mk>
Index: usr.sbin/efidp/Makefile
===================================================================
--- usr.sbin/efidp/Makefile
+++ usr.sbin/efidp/Makefile
@@ -5,4 +5,7 @@
 
 LIBADD= efivar geom
 
+LINKS=	${BINDIR}/efidp ${BINDIR}/uefidp
+MLINKS=	efidp.8 uefidp.8
+
 .include <bsd.prog.mk>
Index: usr.sbin/efivar/Makefile
===================================================================
--- usr.sbin/efivar/Makefile
+++ usr.sbin/efivar/Makefile
@@ -10,4 +10,7 @@
 EFIBOOT=${SRCTOP}/stand/efi
 CFLAGS+=	-I${EFIBOOT}/include
 
+LINKS=	${BINDIR}/efivar ${BINDIR}/uefivar
+MLINKS=	efivar.8 uefivar.8
+
 .include <bsd.prog.mk>
Index: usr.sbin/uefisign/Makefile
===================================================================
--- usr.sbin/uefisign/Makefile
+++ usr.sbin/uefisign/Makefile
@@ -4,6 +4,9 @@
 SRCS=	uefisign.c child.c pe.c
 MAN=	uefisign.8
 
+LINKS=	${BINDIR}/uefisign ${BINDIR}/efisign
+MLINKS=	uefisign.1 efisign.1
+
 LIBADD=	crypto
 
 WARNS=	6