diff --git a/sysutils/syslinux/Makefile b/sysutils/syslinux/Makefile
index d2a825dcb1f1..bb8c06c02a03 100644
--- a/sysutils/syslinux/Makefile
+++ b/sysutils/syslinux/Makefile
@@ -10,6 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Boot loader for the Linux operating system
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
@@ -23,18 +24,9 @@ ALL_TARGET=	bios
 
 MAN1=		syslinux.1
 
-.include <bsd.port.pre.mk>
+PLIST_FILES+=	bin/syslinux
 
-# utility target to build pkg-plist
-_A =	mbr/mbr.bin mbr/gptmbr.bin \
-	core/pxelinux.0 core/isolinux.bin gpxe/gpxelinux.0 \
-	memdisk/memdisk \
-	com32/chain/*.c32 com32/cmenu/libmenu/libmenu.c32 \
-	com32/elflink/ldlinux/*.c32 com32/gfxboot/*.c32 \
-	com32/hdt/*.c32 com32/lib/*.c32 \
-	com32/lua/src/*.c32 com32/mboot/*.c32 \
-	com32/menu/*.c32 com32/modules/*.c32 \
-	com32/rosh/*.c32 com32/sysdump/*.c32
+.include <bsd.port.pre.mk>
 
 # convert elf_i386 to elf_i386_fbsd
 pre-patch:
@@ -46,16 +38,15 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^UMAKEDEPS|#UMAKEDEPS|' ${WRKSRC}/mk/syslinux.mk
 
-build_pkg-plist:
-	@( ${ECHO_CMD} "bin/syslinux"	;		\
-	  cd ${WRKSRC}; for i in ${_A} ; do	\
-		${ECHO_CMD} share/syslinux/`basename $$i` ; done ; \
-	  ${ECHO_CMD} "@dirrm share/syslinux" )
-
 do-install:
-	(cd ${WRKSRC}/bios/mtools && ${INSTALL_PROGRAM} syslinux ${PREFIX}/bin)
-	(cd ${WRKSRC}/man && ${INSTALL_MAN} syslinux.1 ${MANPREFIX}/man/man1)
+	@${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${MANPREFIX}/man/man1
+	@${FIND} -d ${WRKSRC} -type d -empty -delete
 	@${MKDIR} ${DATADIR}
-	(cd ${WRKSRC}/bios && ${INSTALL_DATA} ${_A} ${DATADIR})
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${DATADIR})
+
+post-install:
+	@(cd ${PREFIX} && ${FIND} -d ${DATADIR_REL} -type f >> ${TMPPLIST})
+	@(cd ${PREFIX} && ${FIND} -d ${DATADIR_REL} -type d -exec echo "@dirrm {}" \; >> ${TMPPLIST})
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/syslinux/pkg-plist b/sysutils/syslinux/pkg-plist
deleted file mode 100644
index cfaeb14960ac..000000000000
--- a/sysutils/syslinux/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-bin/syslinux
-%%DATADIR%%/cat.c32
-%%DATADIR%%/chain.c32
-%%DATADIR%%/cmd.c32
-%%DATADIR%%/config.c32
-%%DATADIR%%/cptime.c32
-%%DATADIR%%/cpuid.c32
-%%DATADIR%%/cpuidtest.c32
-%%DATADIR%%/disk.c32
-%%DATADIR%%/dmitest.c32
-%%DATADIR%%/elf.c32
-%%DATADIR%%/ethersel.c32
-%%DATADIR%%/gfxboot.c32
-%%DATADIR%%/gptmbr.bin
-%%DATADIR%%/gpxecmd.c32
-%%DATADIR%%/gpxelinux.0
-%%DATADIR%%/hdt.c32
-%%DATADIR%%/hexdump.c32
-%%DATADIR%%/host.c32
-%%DATADIR%%/ifcpu.c32
-%%DATADIR%%/ifcpu64.c32
-%%DATADIR%%/ifmemdsk.c32
-%%DATADIR%%/ifplop.c32
-%%DATADIR%%/isolinux.bin
-%%DATADIR%%/kbdmap.c32
-%%DATADIR%%/kontron_wdt.c32
-%%DATADIR%%/ldlinux.c32
-%%DATADIR%%/libcom32.c32
-%%DATADIR%%/liblua.c32
-%%DATADIR%%/libmenu.c32
-%%DATADIR%%/linux.c32
-%%DATADIR%%/ls.c32
-%%DATADIR%%/lua.c32
-%%DATADIR%%/mboot.c32
-%%DATADIR%%/mbr.bin
-%%DATADIR%%/memdisk
-%%DATADIR%%/meminfo.c32
-%%DATADIR%%/menu.c32
-%%DATADIR%%/pcitest.c32
-%%DATADIR%%/pmload.c32
-%%DATADIR%%/poweroff.c32
-%%DATADIR%%/prdhcp.c32
-%%DATADIR%%/pwd.c32
-%%DATADIR%%/pxechn.c32
-%%DATADIR%%/pxelinux.0
-%%DATADIR%%/reboot.c32
-%%DATADIR%%/rosh.c32
-%%DATADIR%%/sanboot.c32
-%%DATADIR%%/sdi.c32
-%%DATADIR%%/sysdump.c32
-%%DATADIR%%/vesainfo.c32
-%%DATADIR%%/vesamenu.c32
-%%DATADIR%%/vpdtest.c32
-%%DATADIR%%/whichsys.c32
-%%DATADIR%%/zzjson.c32
-@dirrm %%DATADIR%%