diff --git a/srcpkgs/syslinux/template b/srcpkgs/syslinux/template
index 577c5c21648..fcaab6fc9d9 100644
--- a/srcpkgs/syslinux/template
+++ b/srcpkgs/syslinux/template
@@ -1,14 +1,14 @@
 # Template file for 'syslinux'
 pkgname=syslinux
 version=6.03
-revision=6
+revision=7
 patch_args="-Np1"
 hostmakedepends="perl python nasm"
 makedepends="gnu-efi-libs libuuid-devel"
-short_desc="A boot loader for the Linux operating system"
+short_desc="Boot loader for the Linux operating system"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project"
-license="GPL-2"
 distfiles="${KERNEL_SITE}/utils/boot/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
@@ -25,6 +25,7 @@ pre_build() {
 	# Fix FHS manpage path
 	sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
 }
+
 do_build() {
 	unset CFLAGS LDFLAGS
 	case "$XBPS_TARGET_MACHINE" in
@@ -33,12 +34,12 @@ do_build() {
 	esac
 	make installer
 }
+
 do_install() {
-	make INSTALLROOT=${DESTDIR} install
-	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
+	make INSTALLROOT=${DESTDIR} install SBINDIR=/usr/bin AUXDIR=/usr/lib/syslinux
 	# Remove completely development stuff.
-	rm -r ${DESTDIR}/usr/share/syslinux/com32/include
-	rm ${DESTDIR}/usr/share/syslinux/com32/*.a
+	rm -r ${DESTDIR}/usr/lib/syslinux/com32/include
+	rm ${DESTDIR}/usr/lib/syslinux/com32/*.a
 	# Remove keytab-lilo to prevent conflict with LILO
 	rm ${DESTDIR}/usr/bin/keytab-lilo
 }