diff --git a/biology/figtree/Makefile b/biology/figtree/Makefile
index f28cb0186320..f2bb01c8053b 100644
--- a/biology/figtree/Makefile
+++ b/biology/figtree/Makefile
@@ -1,36 +1,39 @@
 PORTNAME=	figtree
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.4
+DISTVERSION=	1.4.4-14
+DISTVERSIONSUFFIX=	-gf9085b6
 CATEGORIES=	biology education java
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Graphical viewer of phylogenetic trees
 
 LICENSE=	GPLv2
 
 USE_JAVA=	yes
 USE_ANT=	yes
+JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237) ...
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	rambaut
 
 NO_ARCH=	yes
 
 DESKTOP_ENTRIES="FigTree" "Phylogenetic tree viewer" "${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}" \
 		"Biology;Science;Education;" true
 
 PLIST_FILES=	bin/${PORTNAME} \
 		${JAVAJARDIR}/${PORTNAME}-pdf.jar \
 		${JAVAJARDIR}/${PORTNAME}.jar \
 		${JAVAJARDIR}/figtreepanel.jar \
 		share/pixmaps/${PORTNAME}.png \
 
 do-install:
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo ${JAVA} -jar ${JAVAJARDIR}/${PORTNAME}.jar \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/dist/*.jar ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/release/Linux/icons/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 .include <bsd.port.mk>
diff --git a/biology/figtree/distinfo b/biology/figtree/distinfo
index f278a27654ef..888f7a727fff 100644
--- a/biology/figtree/distinfo
+++ b/biology/figtree/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549226829
-SHA256 (rambaut-figtree-v1.4.4_GH0.tar.gz) = 29a2e7fb2de0fa213aa0bb3003347fe278c28d8273bbc06f1d98cda9dda35d89
-SIZE (rambaut-figtree-v1.4.4_GH0.tar.gz) = 20994009
+TIMESTAMP = 1661665731
+SHA256 (rambaut-figtree-v1.4.4-14-gf9085b6_GH0.tar.gz) = 06e6ddf63dd932150431608e5846bbc1d27f8ac22785c41fe06ad121dc77a259
+SIZE (rambaut-figtree-v1.4.4-14-gf9085b6_GH0.tar.gz) = 20445932