diff --git a/cad/fidocadj/Makefile b/cad/fidocadj/Makefile
index f01341e03c35..83078f0b76bb 100644
--- a/cad/fidocadj/Makefile
+++ b/cad/fidocadj/Makefile
@@ -1,42 +1,62 @@
 PORTNAME=	fidocadj
-PORTVERSION=	0.24.8
-PORTREVISION=	2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.24.9-epsilon
+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}-${PORTVERSION}.jar
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Easy to use graphical editor for electronics
 WWW=		https://darwinne.github.io/FidoCadJ/index.html
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	java
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+BUILD_DEPENDS=	bash:shells/bash
 
+USES=		java shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	DarwinNE
+GH_PROJECT=	FidoCadJ
 JAVA_VERSION=	11+
 
-NO_ARCH=	yes
-NO_BUILD=	yes
+SHEBANG_FILES=	dev_tools/*
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+MAKEFILE=	makefile
+ALL_TARGET=	createjar
 
+ICONSDIR=	share/icons/hicolor/512x512/apps
+
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+NO_ARCH=	yes
 SUB_FILES=	${PORTNAME}.sh
-SUB_LIST=	PORTVERSION=${PORTVERSION} JAVA=${JAVA}
+SUB_LIST=	JAVA=${JAVA} \
+		PORTVERSION=${PORTVERSION}
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_DISTFILES=	manual_en.pdf
 
+post-patch:
+	${REINPLACE_CMD} -E \
+		-e 's/^(createjar:)/\1 compile/1' \
+		-e 's/(^Icon=|Exec=).*/\1fidocadj/1' \
+		${WRKSRC}/OSes/linux/fidocadj.desktop \
+		${WRKSRC}/${MAKEFILE}
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DATADIR}; \
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/jar/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/${PORTNAME}-${PORTVERSION}.jar
+	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/OSes/linux/fidocadj.desktop ${STAGEDIR}${DESKTOPDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${ICONSDIR}
+	${INSTALL_DATA} ${WRKSRC}/OSes/mac/icona_fidocadj.png ${STAGEDIR}${PREFIX}/${ICONSDIR}/fidocadj.png
+
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DOCS_DISTFILES} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/cad/fidocadj/distinfo b/cad/fidocadj/distinfo
index c28416bc8a83..d16bb5ac6662 100644
--- a/cad/fidocadj/distinfo
+++ b/cad/fidocadj/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1788187992
+SHA256 (fidocadj/manual_en.pdf) = 0d0a153f1dc47cfd299721d257541125d7b3c21392ca04889cbd8c4cf087137c
+SIZE (fidocadj/manual_en.pdf) = 59885288
+SHA256 (fidocadj/DarwinNE-FidoCadJ-v0.24.9-epsilon_GH0.tar.gz) = 0d0a153f1dc47cfd299721d257541125d7b3c21392ca04889cbd8c4cf087137c
+SIZE (fidocadj/DarwinNE-FidoCadJ-v0.24.9-epsilon_GH0.tar.gz) = 59885288
diff --git a/cad/fidocadj/pkg-plist b/cad/fidocadj/pkg-plist
index 590caa037bb0..88a4f68d9b68 100644
--- a/cad/fidocadj/pkg-plist
+++ b/cad/fidocadj/pkg-plist
@@ -1,3 +1,5 @@
 bin/fidocadj
-%%DATADIR%%/fidocadj-%%PORTVERSION%%.jar
+share/applications/fidocadj.desktop
 %%PORTDOCS%%%%DOCSDIR%%/manual_en.pdf
+share/icons/hicolor/512x512/apps/fidocadj.png
+%%DATADIR%%/fidocadj-%%PORTVERSION%%.jar