Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -2235,11 +2235,9 @@
 # r245440 mtree -N support added
 # r313404 requires sha384.h for libnetbsd, added to libmd in r292782
 .if ${BOOTSTRAPPING} < 1100093
-_nmtree=	lib/libmd \
-		lib/libnetbsd \
-		usr.sbin/nmtree
-
-${_bt}-lib/libnetbsd: ${_bt}-lib/libmd
+_nmtree=	usr.sbin/nmtree
+# The _libnetbsd assignment must be kept in sync with one below (for makefs).
+_libnetbsd=	lib/libmd lib/libnetbsd
 ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd
 .else
 _bootstrap_tools_links+=mtree
@@ -2288,6 +2286,17 @@
 _bootstrap_tools_links+=mkimg
 .endif
 
+# 1300116: cd9660 El Torito EFI boot image
+.if ${BOOTSTRAPPING} < 1202500 || \
+	(${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300116)
+_makefs=	usr.sbin/makefs
+# The _libnetbsd assignment must be kept in sync with one above (for nmtree).
+_libnetbsd=	lib/libmd lib/libnetbsd
+${_bt}-usr.sbin/makefs: ${_bt}-lib/libnetbsd
+.else
+_bootstrap_tools_links+=makefs
+.endif
+
 _yacc=		usr.bin/yacc
 
 .if ${MK_BSNMP} != "no"
@@ -2463,7 +2472,9 @@
     ${_flua} \
     ${_crunchide} \
     ${_crunchgen} \
+    ${_libnetbsd} \
     ${_mkimg} \
+    ${_makefs} \
     ${_nmtree} \
     ${_vtfontcvt} \
     ${_localedef} \
@@ -2486,6 +2497,7 @@
 ${_bt}-usr.bin/sort: ${_bt}-lib/libmd
 ${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
 ${_bt}-sbin/md5: ${_bt}-lib/libmd
+${_bt}-lib/libnetbsd: ${_bt}-lib/libmd
 .endif