diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile
index 7b6c2c00e746..59d9678e37b5 100644
--- a/textproc/saxon-he/Makefile
+++ b/textproc/saxon-he/Makefile
@@ -2,68 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	saxon-he
-PORTVERSION=	9.3.0.5
-PORTREVISION=	1
+PORTVERSION=	9.5.1.5
 CATEGORIES=	textproc java
-MASTER_SITES=	SF/saxon/Saxon-HE/9.3
-DISTNAME=	saxonhe${PORTVERSION:S,.,-,g}j.zip \
-		saxon-resources9-3
+MASTER_SITES=	SF/saxon/Saxon-HE/${PORTVERSION:R:R}
+DISTNAME=	SaxonHE${PORTVERSION:S,.,-,g}J
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java
+MAINTAINER=	makc@FreeBSD.org
+COMMENT=	XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java
 
 LICENSE=	MPL
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
-
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-JARFILES=	saxon9he.jar
-PLIST_FILES+=	${JARFILES:S,^,%%DATADIR%%/,} bin/saxon-he bin/saxon-he-xquery
-PLIST_DIRS+=	%%DATADIR%%
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.endif
-.if !defined(NOPORTEXAMPLES)
-PORTEXAMPLES=	*
-.endif
+JARFILES=	saxon9-unpack.jar \
+		saxon9-xqj.jar \
+		saxon9he.jar
+PLIST_FILES=	${JARFILES:S,^,%%JAVAJARDIR%%/,}
 
-SUB_FILES=	saxon.sh
-SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${DATADIR}/,}"
-
-NO_STAGE=	yes
 do-install:
-	@${ECHO_MSG} -n ">> Installing JARs in ${DATADIR}/..."
-	@${MKDIR} ${DATADIR}
-.for file in ${JARFILES}
-	@${ECHO_MSG} -n " ${file}"
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}/
-.endfor
-	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTEXAMPLES)
-	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}/..."
-	@cd ${WRKSRC}/samples/ \
-	  && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	@cd ${WRKSRC}/doc/ \
-	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-	@${ECHO_MSG} " [ DONE ]"
-.endif
-	@${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..."
-.for scriptfile in saxon-he saxon-he-xquery
-	@${ECHO_MSG} -n " ${scriptfile}"
-	@${INSTALL_SCRIPT} ${WRKSRC}/saxon.sh ${PREFIX}/bin/${scriptfile}
-.endfor
-	@${ECHO_MSG} " [ DONE ]"
+	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${JARFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${JAVAJARDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/saxon-he/distinfo b/textproc/saxon-he/distinfo
index 0eca5d106837..b9a1c245322c 100644
--- a/textproc/saxon-he/distinfo
+++ b/textproc/saxon-he/distinfo
@@ -1,4 +1,2 @@
-SHA256 (saxonhe9-3-0-5j.zip) = 791a198fd650b24ccbf94766a236e6e7a6a9dae7c427594a4aa02cdf4a84a2d3
-SIZE (saxonhe9-3-0-5j.zip) = 2075355
-SHA256 (saxon-resources9-3.zip) = 8fa651aa6de7b9cfd8bb01e0b040858a94c0ed42f3433e3958110af90dedad4d
-SIZE (saxon-resources9-3.zip) = 13582452
+SHA256 (SaxonHE9-5-1-5J.zip) = 5e26cf22e230ef4284bdba848ba53232944af51a1e0e9199c5668851909d6f28
+SIZE (SaxonHE9-5-1-5J.zip) = 3040502
diff --git a/textproc/saxon-he/files/saxon.sh.in b/textproc/saxon-he/files/saxon.sh.in
deleted file mode 100644
index 6dc0121e9c04..000000000000
--- a/textproc/saxon-he/files/saxon.sh.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-IAM="`basename "$0"`"
-
-if [ "${IAM}" = "saxon-he-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
-
-JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@"