Index: share/examples/Makefile
===================================================================
--- share/examples/Makefile
+++ share/examples/Makefile
@@ -37,7 +37,6 @@
 	ses \
 	scsi_target \
 	sunrpc \
-	uefisign \
 	ypldap
 
 XFILES=	BSD_daemon/FreeBSD.pfa \
@@ -198,10 +197,14 @@
 	sunrpc/sort/rsort.c \
 	sunrpc/sort/sort.x \
 	sunrpc/sort/sort_proc.c \
-	uefisign/uefikeys \
 	ypldap/ypldap.conf
 
 BINDIR= ${SHAREDIR}/examples
+
+.if ${MK_EFI} != "no"
+LDIRS+=		uefisign
+XFILES+=	uefisign/uefikeys
+.endif
 
 .if ${MK_HAST} != "no"
 LDIRS+=		hast
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -1613,6 +1613,14 @@
 OLD_DIRS+=usr/share/bsdconfig/usermgmt
 .endif
 
+.if ${MK_EFI} == no
+OLD_FILES+=usr/sbin/uefisign
+OLD_FILES+=usr/sbin/efibootmgr
+OLD_FILES+=usr/sbin/efidp
+OLD_FILES+=usr/sbin/efivar
+OLD_FILES+=usr/share/examples/uefisign/uefikeys
+.endif
+
 .if ${MK_FMTREE} == no
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
Index: usr.sbin/Makefile
===================================================================
--- usr.sbin/Makefile
+++ usr.sbin/Makefile
@@ -89,7 +89,6 @@
 	traceroute \
 	trpt \
 	tzsetup \
-	uefisign \
 	ugidfw \
 	vigr \
 	vipw \
@@ -124,6 +123,9 @@
 SUBDIR.${MK_MLX5TOOL}+=	mlx5tool
 SUBDIR.${MK_DIALOG}+=	bsdconfig
 SUBDIR.${MK_EFI}+=	efivar efidp efibootmgr
+.if ${MK_EFI} != "no" && ${MK_OPENSSL} != "no"
+SUBDIR.yes+=		uefisign
+.endif
 SUBDIR.${MK_FLOPPY}+=	fdcontrol
 SUBDIR.${MK_FLOPPY}+=	fdformat
 SUBDIR.${MK_FLOPPY}+=	fdread