Index: share/examples/Makefile
===================================================================
--- share/examples/Makefile
+++ share/examples/Makefile
@@ -31,7 +31,6 @@
 	ses \
 	scsi_target \
 	sunrpc \
-	uefisign \
 	ypldap
 
 
@@ -343,8 +342,10 @@
 	sort.x \
 	sort_proc.c
 
+.if ${MK_EFI} != "no"
 SE_DIRS+=	uefisign
 SE_UEFISIGN=	uefikeys
+.endif
 
 SE_DIRS+=	ypldap
 SE_YPLDAP=	ypldap.conf
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -1614,6 +1614,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 \
@@ -123,6 +122,9 @@
 SUBDIR.${MK_CXGBETOOL}+=	cxgbetool
 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