diff --git a/astro/josm/Makefile b/astro/josm/Makefile
index d0eb1995785d..537d0e0f4984 100644
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	josm
-PORTVERSION=	19439
-PORTREVISION=	1
+PORTVERSION=	19481
 CATEGORIES=	astro java
 MASTER_SITES=	https://josm.openstreetmap.de/download/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}.jar
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Comprehensive editor for OpenStreetMap.org database
 WWW=		https://josm.openstreetmap.de/
 
 LICENSE=	GPLv2+
 
 PORTSCOUT=	ignore:1
 
 NO_WRKSUBDIR=	yes
 
 USES=		java zip:infozip
-JAVA_VERSION=	11+
+JAVA_VERSION=	21  # latest supported version, see https://josm.openstreetmap.de/wiki/Download#linux
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	josm.sh
-SUB_LIST=	JARNAME=${DISTNAME}
+SUB_LIST=	JAVA=${JAVA} JARNAME=${DISTNAME}
 
 PLIST_FILES=	bin/josm \
 		${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME} \
 		share/pixmaps/josm.png
 
 DESKTOP_ENTRIES="JOSM" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME}" \
 		"Education;Geoscience;Maps;" \
 		true
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/josm.sh ${STAGEDIR}${PREFIX}/bin/josm
 	${INSTALL_DATA} ${WRKSRC}/images/logo_32x32x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/josm.png
 
 .include <bsd.port.mk>
diff --git a/astro/josm/distinfo b/astro/josm/distinfo
index 19b52387b88d..b9f0df949dbd 100644
--- a/astro/josm/distinfo
+++ b/astro/josm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1760555712
-SHA256 (josm-snapshot-19439.jar) = 9be9e406aeee7ab0e14fbd241aa77ca19cce2ae96a65f3c33e7ab5bac37fbd3c
-SIZE (josm-snapshot-19439.jar) = 19265757
+TIMESTAMP = 1772125475
+SHA256 (josm-snapshot-19481.jar) = 1e5dd927855653bc6d85eb387714b54c53cc1561907c2fe437b046135d11b85e
+SIZE (josm-snapshot-19481.jar) = 19819942
diff --git a/astro/josm/files/josm.sh.in b/astro/josm/files/josm.sh.in
index b3705ab2d572..7dedea2c0646 100644
--- a/astro/josm/files/josm.sh.in
+++ b/astro/josm/files/josm.sh.in
@@ -1,7 +1,3 @@
 #!/bin/sh
 
-JAVA="%%LOCALBASE%%/bin/java"
-JARPATH="%%JAVALIBDIR%%"
-export JAVA_VERSION="%%JAVA_VERSION%%"
-
-exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@"
+exec "%%JAVA%%" -jar "%%JAVALIBDIR%%/%%JARNAME%%" "$@"