diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index 5eaaa7fe9546..48b66345a827 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	argouml
-PORTVERSION=	0.34
-PORTREVISION=	2
+DISTVERSION=	0.35.1
 CATEGORIES=	devel java
-MASTER_SITES=	https://github.com/argouml-tigris-org/argouml/releases/download/VERSION_0_34/
-DISTNAME=	ArgoUML-${PORTVERSION}
+MASTER_SITES=	https://github.com/argouml-tigris-org/argouml/releases/download/VERSION_${DISTVERSION:C/\./_/g}/
+DISTNAME=	ArgoUML-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		manual-${PORTVERSION}.pdf \
-		quickguide-${PORTVERSION}.pdf
+		manual-${DISTVERSION}.pdf \
+		quickguide-${DISTVERSION}.pdf
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UML design tool with cognitive support
 WWW=		https://github.com/argouml-tigris-org/argouml/wiki
 
 LICENSE=	EPL
 
 USES=		java
-
-PORTSCOUT=	limitw:1,even \
-		site:${MASTER_SITES:S/argouml-${PORTVERSION}\///}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_BUILD=	yes
-
-SUB_FILES=	argouml.sh
-PORTDOCS=	manual-${PORTVERSION}.pdf quickguide-${PORTVERSION}.pdf
-
-OPTIONS_DEFINE=	DOCS
+JAVA_VERSION=	${ARGOUML_JAVA_VERSION:U8 11 17 18}
 
 DESKTOP_ENTRIES=	"ArgoUML" \
 			"Create advanced UML diagrams" \
 			"${DATADIR}/icon/ArgoIcon128x128.png" \
 			"argouml" \
 			"Development;Building;Java;" \
 			false
+NO_ARCH=	yes
+NO_BUILD=	yes
+PORTSCOUT=	limitw:1,even \
+		site:${MASTER_SITES:S/argouml-${DISTVERSION}\///}
+SUB_FILES=	argouml.sh
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
+PORTDOCS=	manual-${DISTVERSION}.pdf quickguide-${DISTVERSION}.pdf
+
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/argouml.sh ${STAGEDIR}${PREFIX}/bin/argouml
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/ext
 	${INSTALL_DATA} ${WRKSRC}/ext/*.jar ${STAGEDIR}${DATADIR}/ext
 	${INSTALL_DATA} ${WRKSRC}/ext/*.xml ${STAGEDIR}${DATADIR}/ext
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icon
 	${INSTALL_DATA} ${WRKSRC}/icon/*.png ${STAGEDIR}${DATADIR}/icon
 	${INSTALL_DATA} ${WRKSRC}/icon/*.svg ${STAGEDIR}${DATADIR}/icon
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/quickguide-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual-${DISTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/quickguide-${DISTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/argouml/distinfo b/devel/argouml/distinfo
index 056f5d8c5168..f60bdd72827f 100644
--- a/devel/argouml/distinfo
+++ b/devel/argouml/distinfo
@@ -1,6 +1,7 @@
-SHA256 (argouml/ArgoUML-0.34.tar.gz) = 818fdbbbaf48f70f3a7386cd4dab5313cdba3293b3d8df49a3045911a5372dc3
-SIZE (argouml/ArgoUML-0.34.tar.gz) = 16504818
-SHA256 (argouml/manual-0.34.pdf) = 13c91e8b7802fe3a4d4462b9608f06755981549865a710dccc2372021b270c49
-SIZE (argouml/manual-0.34.pdf) = 3405949
-SHA256 (argouml/quickguide-0.34.pdf) = 6972651140234aad7c1c93948f1d788b1c0a64dc09d8a5342d712904d181e458
-SIZE (argouml/quickguide-0.34.pdf) = 58334
+TIMESTAMP = 1742236472
+SHA256 (argouml/ArgoUML-0.35.1.tar.gz) = 5e5230eb1bd29c545ae6fd56c0bdfbee86b1e6c2c538d6df22728fa3e3ab1639
+SIZE (argouml/ArgoUML-0.35.1.tar.gz) = 19048499
+SHA256 (argouml/manual-0.35.1.pdf) = 3c1634556a3adcb0eaf427184472b72197b9f451c3d91599a2dfbdcc2fcd5b56
+SIZE (argouml/manual-0.35.1.pdf) = 3405954
+SHA256 (argouml/quickguide-0.35.1.pdf) = abbc989ebb380cf8285d40e7211319bdac66edeface01bb09af48bf4672b16dd
+SIZE (argouml/quickguide-0.35.1.pdf) = 58337
diff --git a/devel/argouml/files/argouml.sh.in b/devel/argouml/files/argouml.sh.in
index 879ae04cbfdb..7c480e673bb3 100644
--- a/devel/argouml/files/argouml.sh.in
+++ b/devel/argouml/files/argouml.sh.in
@@ -1,3 +1,7 @@
 #!/bin/sh
 
+if [ -z "${JAVA_HOME}" ]; then
+	export JAVA_HOME="%%JAVA_HOME%%"
+fi
+
 "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/argouml.jar" "$@"
diff --git a/devel/argouml/pkg-message b/devel/argouml/pkg-message
new file mode 100644
index 000000000000..5baf261e6edd
--- /dev/null
+++ b/devel/argouml/pkg-message
@@ -0,0 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+The Java versions supported by this port are in range from 8 to 18. The default
+is JAVA_DEFAULT=8 now. Add DEFAULT_VERSIONS+=java=N to /etc/make.conf if you
+want to use Java "N", but all Java ports will also be affected. Or add
+ARGOUML_JAVA_VERSION=N to /etc/make.conf if you want to override the Java
+version for this port only.
+EOM
+}
+]
diff --git a/devel/argouml/pkg-plist b/devel/argouml/pkg-plist
index 2a7025974654..e16286f8bb84 100644
--- a/devel/argouml/pkg-plist
+++ b/devel/argouml/pkg-plist
@@ -1,71 +1,81 @@
 bin/argouml
 %%DATADIR%%/antlr-2.7.7.jar
 %%DATADIR%%/argouml-euml.jar
 %%DATADIR%%/argouml-mdr.jar
 %%DATADIR%%/argouml-model.jar
 %%DATADIR%%/argouml.jar
 %%DATADIR%%/batik-awt-util-1.7.jar
 %%DATADIR%%/batik-dom-1.7.jar
 %%DATADIR%%/batik-ext-1.7.jar
 %%DATADIR%%/batik-svggen-1.7.jar
 %%DATADIR%%/batik-util-1.7.jar
 %%DATADIR%%/batik-xml-1.7.jar
 %%DATADIR%%/commons-logging-1.0.2.jar
 %%DATADIR%%/ext/anarres-cpp-no-dependencies-1.2.3.jar
 %%DATADIR%%/ext/antlr-2.7.7.jar
 %%DATADIR%%/ext/antlr-runtime-3.1.1.jar
 %%DATADIR%%/ext/argo_cpp.jar
 %%DATADIR%%/ext/argo_idl.jar
 %%DATADIR%%/ext/argo_java.jar
 %%DATADIR%%/ext/argo_php.jar
 %%DATADIR%%/ext/argouml-csharp.jar
 %%DATADIR%%/ext/argouml-diagrams-activity.jar
 %%DATADIR%%/ext/argouml-diagrams-deployment.jar
 %%DATADIR%%/ext/argouml-diagrams-sequence.jar
 %%DATADIR%%/ext/argouml-diagrams-state.jar
 %%DATADIR%%/ext/argouml-i18n-de.jar
 %%DATADIR%%/ext/argouml-i18n-en_GB.jar
 %%DATADIR%%/ext/argouml-i18n-es.jar
 %%DATADIR%%/ext/argouml-i18n-fr.jar
 %%DATADIR%%/ext/argouml-i18n-it.jar
 %%DATADIR%%/ext/argouml-i18n-nb.jar
 %%DATADIR%%/ext/argouml-i18n-pt.jar
 %%DATADIR%%/ext/argouml-i18n-pt_BR.jar
 %%DATADIR%%/ext/argouml-i18n-ru.jar
 %%DATADIR%%/ext/argouml-i18n-zh.jar
 %%DATADIR%%/ext/argouml-notation.jar
 %%DATADIR%%/ext/argouml-sql.jar
 %%DATADIR%%/ext/argouml-transformer.jar
 %%DATADIR%%/ext/argouml-umlpropertypanels.jar
 %%DATADIR%%/ext/domainmapping.xml
-%%DATADIR%%/gef-0.13.8.jar
+%%DATADIR%%/gef-0.13.9M1.jar
 %%DATADIR%%/icon/ArgoIcon128x128.png
 %%DATADIR%%/icon/ArgoIcon256x256.png
 %%DATADIR%%/icon/ArgoIcon512x512.png
 %%DATADIR%%/icon/argouml2.svg
 %%DATADIR%%/java-interfaces.jar
 %%DATADIR%%/jmi.jar
 %%DATADIR%%/jmiutils.jar
 %%DATADIR%%/log4j-1.2.6.jar
 %%DATADIR%%/mdrapi.jar
 %%DATADIR%%/mof.jar
 %%DATADIR%%/nbmdr.jar
 %%DATADIR%%/ocl-argo-1.1.jar
 %%DATADIR%%/openide-util.jar
 %%DATADIR%%/org.eclipse.emf.common_2.6.0.v20100914-1218.jar
 %%DATADIR%%/org.eclipse.emf.ecore.change.edit_2.5.0.v20100521-1846.jar
 %%DATADIR%%/org.eclipse.emf.ecore.change_2.5.1.v20100907-1643.jar
 %%DATADIR%%/org.eclipse.emf.ecore.edit_2.6.0.v20100914-1218.jar
 %%DATADIR%%/org.eclipse.emf.ecore.xmi_2.5.0.v20100521-1846.jar
 %%DATADIR%%/org.eclipse.emf.ecore_2.6.1.v20100914-1218.jar
 %%DATADIR%%/org.eclipse.emf.edit_2.6.0.v20100914-1218.jar
 %%DATADIR%%/org.eclipse.emf.mapping.ecore2xml_2.5.0.v20100521-1847.jar
 %%DATADIR%%/org.eclipse.emf.mapping.ecore_2.6.0.v20100914-1218.jar
 %%DATADIR%%/org.eclipse.emf.mapping_2.6.0.v20100914-1218.jar
 %%DATADIR%%/org.eclipse.uml2.common.edit_1.5.0.v201005031530.jar
 %%DATADIR%%/org.eclipse.uml2.common_1.5.0.v201005031530.jar
 %%DATADIR%%/org.eclipse.uml2.uml.edit_3.1.0.v201005031530.jar
 %%DATADIR%%/org.eclipse.uml2.uml.resources_3.1.1.v201008191505.jar
 %%DATADIR%%/org.eclipse.uml2.uml_3.1.1.v201008191505.jar
+%%DATADIR%%/saxon9-dom.jar
+%%DATADIR%%/saxon9-dom4j.jar
+%%DATADIR%%/saxon9-jdom.jar
+%%DATADIR%%/saxon9-s9api.jar
+%%DATADIR%%/saxon9-sql.jar
+%%DATADIR%%/saxon9-unpack.jar
+%%DATADIR%%/saxon9-xom.jar
+%%DATADIR%%/saxon9-xpath.jar
+%%DATADIR%%/saxon9-xqj.jar
+%%DATADIR%%/saxon9.jar
 %%DATADIR%%/swidgets-0.1.4.jar
 %%DATADIR%%/toolbar-1.4.1-20071227.jar