diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile
index 0cf15bac7260..decab80302cb 100644
--- a/textproc/saxon-he/Makefile
+++ b/textproc/saxon-he/Makefile
@@ -1,45 +1,52 @@
 PORTNAME=	saxon-he
 DISTVERSION=	12-8
 CATEGORIES=	textproc java
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/SaxonHE-${DISTVERSION}/
 DISTNAME=	SaxonHE${DISTVERSION}J
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	XSLT 3.0 / XPath 3.1 / XQuery 3.1 processor for Java
 WWW=		https://www.saxonica.com/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/notices/LICENSE.txt
 
 #USE_GITHUB=	yes
 GH_ACCOUNT=	Saxonica
 GH_PROJECT=	Saxon-HE
 
 USES=		java zip
 
 NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 _XMLRESOLVER_VER=5.3.3
 JARFILES=	${JARFILES1} ${JARFILES2}
 JARFILES1=	saxon-he-${PORTVERSION}.jar \
 		saxon-he-test-${PORTVERSION}.jar \
 		saxon-he-xqj-${PORTVERSION}.jar
 JARFILES2=	jline-2.14.6.jar \
 		xmlresolver-${_XMLRESOLVER_VER}.jar \
 		xmlresolver-${_XMLRESOLVER_VER}-data.jar
-PLIST_FILES=	${JARFILES:S,^,%%JAVAJARDIR%%/,}
+PLIST_FILES=	${JARFILES:S,^,%%JAVAJARDIR%%/,} ${SCRIPTFILES}
+
+SUB_FILES=	saxon.sh
+SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
+SCRIPTFILES=	bin/saxon bin/saxon-xquery
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${JARFILES1:S,^,${WRKSRC}/,} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${JARFILES2:S,^,${WRKSRC}/lib/,} ${STAGEDIR}${JAVAJARDIR}
+.for scriptfile in ${SCRIPTFILES}
+	${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/${scriptfile}
+.endfor
 
 post-stage:
 # smoke test so we're sure we can load all required classes
 # (12.0 and 12.6 didn't work with OpenJDK 8)
 	${JAVA} -cp '${STAGEDIR}${JAVAJARDIR}/*' net.sf.saxon.Transform -? 2>&1 \
 		| ${HEAD} -n1
 
 .include <bsd.port.mk>
diff --git a/textproc/saxon-he/files/saxon.sh.in b/textproc/saxon-he/files/saxon.sh.in
new file mode 100644
index 000000000000..3cb3014693c0
--- /dev/null
+++ b/textproc/saxon-he/files/saxon.sh.in
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+IAM="`basename "$0"`"
+
+if [ "${IAM}" = "saxon-xquery" ]
+then
+	LAUNCHER_CLASS="net.sf.saxon.Query"
+else
+	LAUNCHER_CLASS="net.sf.saxon.Transform"
+fi
+
+SAXON_CLASSPATH=""
+for jarfile in %%SAXON_JARS%%
+do
+	SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}"
+done
+
+exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"