Index: net/ipxe/Makefile
===================================================================
--- net/ipxe/Makefile
+++ net/ipxe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ipxe
 DISTVERSION=	20200314
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -66,8 +67,11 @@
 ISO_DESC=	Create bootable CD image
 
 _EFI_ARCHS=		${ARCH:Mamd64:S/amd64/x86_64/} i386
+_EFI_FLAVORS=		ipxe snp snponly
 .for _arch in ${_EFI_ARCHS}
-EFI_PLIST_FILES+=	${DATADIR}/ipxe.efi-${_arch}
+. for _efi_flavor in ${_EFI_FLAVORS}
+EFI_PLIST_FILES+=	${DATADIR}/${_efi_flavor}.efi-${_arch}
+. endfor
 .endfor
 
 ISO_BUILD_DEPENDS=	${LOCALBASE}/share/syslinux/bios/core/isolinux.bin:sysutils/syslinux \
@@ -105,7 +109,9 @@
 
 do-build-EFI-on:
 .for _arch in ${_EFI_ARCHS}
-	${DO_MAKE_BUILD} ARCH=${_arch} -C ${WRKSRC} bin-${_arch}-efi/ipxe.efi
+. for _efi_flavor in ${_EFI_FLAVORS}
+	${DO_MAKE_BUILD} ARCH=${_arch} -C ${WRKSRC} bin-${_arch}-efi/${_efi_flavor}.efi
+. endfor
 .endfor
 
 do-install:
@@ -114,7 +120,9 @@
 
 do-install-EFI-on:
 .for _arch in ${_EFI_ARCHS}
-	${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/ipxe.efi ${STAGEDIR}${DATADIR}/ipxe.efi-${_arch}
+. for _efi_flavor in ${_EFI_FLAVORS}
+	${INSTALL_DATA} ${WRKSRC}/bin-${_arch}-efi/${_efi_flavor}.efi ${STAGEDIR}${DATADIR}/${_efi_flavor}.efi-${_arch}
+. endfor
 .endfor
 
 .include <bsd.port.post.mk>
Index: net/ipxe/files/pkg-message.in
===================================================================
--- net/ipxe/files/pkg-message.in
+++ net/ipxe/files/pkg-message.in
@@ -11,6 +11,9 @@
 - ipxe.usb for creating a bootable USB key
 - undionly.kpxe for chainloading from a PXE ROM; contains only
   the UNDI drivers
+- snponly.efi-* similar to undionly, but uses SNP/NII, should
+  only find and boot the specific NIC device it was chained from
+- snp.efi-* same as snponly but tries to boot all devices
 - {8086100f,808610d3,10222000,15ad07b0}.rom for replacing the
   VMware PXE ROM.  See http://ipxe.org/howto/vmware for more
   information.