Index: net/ipxe/Makefile
===================================================================
--- net/ipxe/Makefile
+++ net/ipxe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ipxe
 PORTVERSION=	20180220
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -64,8 +64,8 @@
 		general:PING_CMD \
 		general:POWEROFF_CMD
 
-OPTIONS_DEFAULT=	ISO
-OPTIONS_DEFINE=		ISO
+OPTIONS_DEFAULT=        ISO UNDIONLY EFI
+OPTIONS_DEFINE=         ISO UNDIONLY EFI
 
 ISO_DESC=	Create bootable CD image
 
@@ -76,6 +76,15 @@
 ISO_MAKE_ARGS=	ISOLINUX_BIN="${WRKSRC}/isolinux.bin" \
 		LDLINUX_C32="${LOCALBASE}/share/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32"
 
+EFI_DESC=	Create EFI image
+EFI_ARCHS=	i386 x86_64
+.for _arch in ${EFI_ARCHS}
+EFI_PLIST_FILES+=	${DATADIR}/ipxe.efi-${_arch}
+.endfor
+
+UNDIONLY_DESC=	Create PXE-loadable image that contains only the UNDI drivers
+UNDIONLY_ALL_TARGET=	bin/undionly.kpxe
+
 .include <bsd.port.pre.mk>
 
 # Add user supplied build configuration after port options etc have
@@ -90,6 +99,16 @@
 .endif
 .endfor
 
+do-build-EFI-on:
+.for _arch in ${EFI_ARCHS}
+	cd ${WRKSRC} && ${DO_MAKE_BUILD} ARCH=${_arch} bin-${_arch}-efi/ipxe.efi
+.endfor
+
+do-install-EFI-on:
+.for _arch in ${EFI_ARCHS}
+	cd ${WRKSRC} && ${INSTALL_DATA} bin-${_arch}-efi/ipxe.efi ${STAGEDIR}${DATADIR}/ipxe.efi-${_arch}
+.endfor
+
 pre-build-ISO-on:
 # ISO creation fails if isolinux.bin is read only
 	${INSTALL} -m 644 ${LOCALBASE}/share/syslinux/bios/core/isolinux.bin ${WRKSRC}/isolinux.bin