diff --git a/deskutils/freeplane/Makefile b/deskutils/freeplane/Makefile
index 84f691c1d74a..793c08a6f85b 100644
--- a/deskutils/freeplane/Makefile
+++ b/deskutils/freeplane/Makefile
@@ -1,40 +1,43 @@
 PORTNAME=	freeplane
 DISTVERSION=	1.13.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils editors java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable
 DISTNAME=	${PORTNAME}_bin-${PORTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Free mind mapping and knowledge management software
 WWW=		https://www.freeplane.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe desktop-file-utils java shebangfix zip
 
+JAVA_VERSION=	8 11 17 21 23
+
 SHEBANG_FILES=	${WRKSRC}/freeplane.sh
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	freeplane freeplane.desktop
 SUB_LIST=	DATADIR=${DATADIR} \
+		JAVA_HOME=${JAVA_HOME} \
 		PREFIX=${PREFIX}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
 		"! ( -name license\.txt -or -name *\.bat -or -name *\.exe -or \
 		-name *\.orig -or -name *\.bak -or -name freeplane.sh -or \
 		-name *\.dll -or -name *\.so )"
 	${INSTALL_DATA} ${WRKDIR}/freeplane.desktop ${STAGEDIR}${DESKTOPDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/freeplane.sh ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/freeplane ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/deskutils/freeplane/files/freeplane.in b/deskutils/freeplane/files/freeplane.in
index 4b0ff3dad1ac..d60be1155a7c 100644
--- a/deskutils/freeplane/files/freeplane.in
+++ b/deskutils/freeplane/files/freeplane.in
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 # Fix an issue with dropdown menu in Wayland that prevents
 # to open or select any items with the mouse cursor.
 if [ -n "$WAYLAND_DISPLAY" ]; then
     export _JAVA_AWT_WM_NONREPARENTING=1
 fi
 
+export FREEPLANE_JAVA_HOME=%%JAVA_HOME%%
+
 exec %%DATADIR%%/freeplane.sh "$@"