diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index f5c8248fb38d..790814e75e1c 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	fidocadj
-PORTVERSION=	0.24.7
+PORTVERSION=	0.24.8
 PORTREVISION=	0
 CATEGORIES=	cad java
 # No USE_GITHUB here because GITHUB_EXTRACT_SUFX is hardcoded to .tar.gz
 MASTER_SITES=	https://github.com/DarwinNE/FidoCadJ/releases/download/v${PORTVERSION}/
-DISTFILES=	${PORTNAME}.jar
+DISTFILES=	${PORTNAME}-${PORTVERSION}.jar
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=
 
@@ -18,10 +18,15 @@ LICENSE=	GPLv3
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
+JAVA_VERSION=	11+
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 SUB_FILES=	${PORTNAME}.sh
+SUB_LIST=	PORTVERSION=${PORTVERSION} JAVA=${JAVA}
 
 USE_JAVA=	yes
 
@@ -32,7 +37,7 @@ DOCS_DISTFILES=	manual_en.pdf
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DATADIR}; \
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${DATADIR}/
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DOCS_DISTFILES} ${STAGEDIR}${DOCSDIR}/
diff --git a/cad/fidocadj/distinfo b/cad/fidocadj/distinfo
index d8b22d6c88fa..c28416bc8a83 100644
--- a/cad/fidocadj/distinfo
+++ b/cad/fidocadj/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1590333888
-SHA256 (fidocadj/fidocadj.jar) = 18782a9f60a1611d83487a3d7209dc67d72e6b24d1924ff2e6ba71c5111e43a8
-SIZE (fidocadj/fidocadj.jar) = 664563
-SHA256 (fidocadj/manual_en.pdf) = 8da975735cd4a62350387984fec682d4e6de8c6a261c0422f6d65d8b80857dde
-SIZE (fidocadj/manual_en.pdf) = 2772362
+TIMESTAMP = 1592233818
+SHA256 (fidocadj/fidocadj-0.24.8.jar) = 6c6a5fcb5cd57f171500ede9f32d5c1dc4e2c5873e85fc5c44f78aa495b17459
+SIZE (fidocadj/fidocadj-0.24.8.jar) = 715686
+SHA256 (fidocadj/manual_en.pdf) = 218d44682ea97f4f83526796abf93a7f3bc4cc1d8dcbcac96a07c20294d07e1f
+SIZE (fidocadj/manual_en.pdf) = 2242717
diff --git a/cad/fidocadj/files/fidocadj.sh.in b/cad/fidocadj/files/fidocadj.sh.in
index b3b57c70e257..9667f7283cd1 100644
--- a/cad/fidocadj/files/fidocadj.sh.in
+++ b/cad/fidocadj/files/fidocadj.sh.in
@@ -2,4 +2,4 @@
 #
 # $FreeBSD$
 
-"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/fidocadj.jar" "$@"
+"%%JAVA%%" -jar "%%DATADIR%%/fidocadj-%%PORTVERSION%%.jar" "$@"
diff --git a/cad/fidocadj/pkg-plist b/cad/fidocadj/pkg-plist
index 00106fd7fa91..590caa037bb0 100644
--- a/cad/fidocadj/pkg-plist
+++ b/cad/fidocadj/pkg-plist
@@ -1,3 +1,3 @@
 bin/fidocadj
-%%DATADIR%%/fidocadj.jar
+%%DATADIR%%/fidocadj-%%PORTVERSION%%.jar
 %%PORTDOCS%%%%DOCSDIR%%/manual_en.pdf