diff --git a/games/gogui/Makefile b/games/gogui/Makefile
index e0573e77505b..5eeab1715fcc 100644
--- a/games/gogui/Makefile
+++ b/games/gogui/Makefile
@@ -1,54 +1,60 @@
 PORTNAME=	gogui
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.10
-PORTREVISION=	1
+DISTVERSION=	1.5.4a
 CATEGORIES=	games java
 MASTER_SITES=	http://www.randelshofer.ch/quaqua/files/:quaqua
 DISTFILES=	quaqua-5.2.1.nested.zip:quaqua
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GUI for programs that play Go through Go Text Protocol (GTP)
-WWW=		https://github.com/lemonsqueeze/gogui
+WWW=		https://github.com/Remi-Coulom/gogui # was https://github.com/lemonsqueeze/gogui
 
 LICENSE=	LGPL21 BSD3CLAUSE
 LICENSE_COMB=	multi
 
 BROKEN_aarch64=	compilation fails: Internal Error (assembler_aarch64.hpp:237) ..., and it breaks with Java 11 and Java 17, see https://github.com/lemonsqueeze/gogui/issues/3
 
-BUILD_DEPENDS=	xsltproc:textproc/libxslt \
-		docbook-xsl>0:textproc/docbook-xsl
+BUILD_DEPENDS=	bash:shells/bash \
+		docbook-xsl>0:textproc/docbook-xsl \
+		inkscape:graphics/inkscape \
+		xsltproc:textproc/libxslt
 
-USES=		java:ant,run
+USES=		java:ant,run shebangfix
 USE_GITHUB=	yes
-GH_ACCOUNT=	lemonsqueeze
+GH_ACCOUNT=	Remi-Coulom # was lemonsqueeze
+
+SHEBANG_FILES=	src/net/sf/gogui/images/svg.sh
 
 MAKE_ARGS+=	-Ddocbook-xsl.dir=${LOCALBASE}/share/xsl/docbook
 
 NO_ARCH=	yes
 
 GOGUI_JARS=	gogui-adapter gogui-convert gogui-dummy gogui-server gogui-terminal gogui-twogtp \
 		gogui-client gogui-display gogui-regress gogui-statistics gogui-thumbnailer gogui
 
 PLIST_FILES=	${GOGUI_JARS:C/^/bin\//} ${GOGUI_JARS:C/^/${JAVAJARDIR}\//:C/$$/.jar/} ${JAVAJARDIR}/quaqua.jar
 
 post-extract:
 	@cd ${WRKDIR} && \
 		unzip quaqua-5.2.1.zip && \
 		${MKDIR} ${WRKSRC}/lib && \
 		${MV} Quaqua/dist/quaqua.jar ${WRKSRC}/lib
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/build.xml
 
+pre-build: # generate image files
+	@cd ${WRKSRC}/src/net/sf/gogui/images && ./svg.sh
+
 do-install:
 .for j in ${GOGUI_JARS}
 	${INSTALL_DATA} ${WRKSRC}/lib/${j}.jar ${STAGEDIR}${JAVAJARDIR}
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "${JAVA} -jar ${JAVAJARDIR}/${j}.jar" \
 	) > ${STAGEDIR}${PREFIX}/bin/${j}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${j}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/lib/quaqua.jar ${STAGEDIR}${JAVAJARDIR}
 
 .include <bsd.port.mk>
diff --git a/games/gogui/distinfo b/games/gogui/distinfo
index 708ce1a6e619..a3d452ea5006 100644
--- a/games/gogui/distinfo
+++ b/games/gogui/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1560109987
+TIMESTAMP = 1737283958
 SHA256 (quaqua-5.2.1.nested.zip) = 5473653f8a153122e864137704db52cb02e04a24cbbba6c59df11d4f945f79d6
 SIZE (quaqua-5.2.1.nested.zip) = 5985193
-SHA256 (lemonsqueeze-gogui-v1.4.10_GH0.tar.gz) = a9a957e3e0b2eba9f39ad22197698b9343ea0054e769cb3f42620c7bbc3a1dba
-SIZE (lemonsqueeze-gogui-v1.4.10_GH0.tar.gz) = 723690
+SHA256 (Remi-Coulom-gogui-v1.5.4a_GH0.tar.gz) = 742564513fe846368913d435e9146b24e04b1aeaaa3608e8d8637a85fc0c8ded
+SIZE (Remi-Coulom-gogui-v1.5.4a_GH0.tar.gz) = 730262