diff --git a/math/geogebra/Makefile b/math/geogebra/Makefile
index d8e82e225eee..f8adae1ca88d 100644
--- a/math/geogebra/Makefile
+++ b/math/geogebra/Makefile
@@ -1,46 +1,49 @@
 PORTNAME=	geogebra
-PORTVERSION=	5.0.752.0
+DISTVERSION=	5-2-846-0
 CATEGORIES=	math education java
-MASTER_SITES=	http://download.geogebra.org/installers/5.0/ \
+MASTER_SITES=	http://download.geogebra.org/installers/5.2/ \
 		https://static.geogebra.org/images/ \
 		http://freebsd.uzsolt.hu/src/
-DISTNAME=	GeoGebra-Linux-Portable-${PORTVERSION:S/./-/g}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} geogebra.png geogebra-logo.svg
+DISTNAME=	GeoGebra-Linux-Portable-${DISTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		geogebra.png \
+		geogebra-logo.svg
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Dynamic software that joins geometry, algebra, and calculus
 WWW=		https://www.geogebra.org/
 
 LICENSE=	GEOGEBRA
 LICENSE_NAME=	GeoGebra Non-Commercial License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		tar:bzip2 desktop-file-utils gnome shebangfix shared-mime-info
+USES=		desktop-file-utils gnome shared-mime-info shebangfix tar:bzip2
 USE_JAVA=	yes
+JAVA_VERSION=	17+
 
 CONFLICTS=	math/geogebra-i18n
 
-NO_BUILD=	yes
 NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
+NO_BUILD=	yes
 SUB_FILES=	geogebra.desktop geogebra.sh
 SUB_LIST=	JAVA=${JAVA}
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/geogebra.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/geogebra/*.jar ${STAGEDIR}${DATADIR}/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 	${INSTALL_DATA} ${FILESDIR}/geogebra-mime.xml ${STAGEDIR}${PREFIX}/share/mime/packages
 	${INSTALL_DATA} ${WRKDIR}/geogebra.desktop ${STAGEDIR}${DESKTOPDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${DISTDIR}/geogebra.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/geogebra.png
 	${INSTALL_DATA} ${DISTDIR}/geogebra-logo.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/geogebra.svg
 
 .include <bsd.port.mk>
diff --git a/math/geogebra/distinfo b/math/geogebra/distinfo
index c00d86ea8cfe..5e3f959d663d 100644
--- a/math/geogebra/distinfo
+++ b/math/geogebra/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1672662750
-SHA256 (GeoGebra-Linux-Portable-5-0-752-0.tar.bz2) = 264fe4e8cbb6acd10710984d3eb3cf0cdcb587e0ae7436a780edf31eda245360
-SIZE (GeoGebra-Linux-Portable-5-0-752-0.tar.bz2) = 131020013
+TIMESTAMP = 1719754229
+SHA256 (GeoGebra-Linux-Portable-5-2-846-0.tar.bz2) = 90af68d756fbc41e4f2eda1c2411a3431f2c71d44b41d8617868052972f89479
+SIZE (GeoGebra-Linux-Portable-5-2-846-0.tar.bz2) = 64579693
 SHA256 (geogebra.png) = e97122d77209e2c235f5afcee8f783c1e933d14062851ac73a4ed7a6520c5614
 SIZE (geogebra.png) = 4018
 SHA256 (geogebra-logo.svg) = 55ded6b5ec9ad382494f858d8ab5def0ed6c7d529481cd212863b2edde3b5e07
 SIZE (geogebra-logo.svg) = 6523
diff --git a/math/geogebra/pkg-plist b/math/geogebra/pkg-plist
index 748369a74bb8..4724f71733d5 100644
--- a/math/geogebra/pkg-plist
+++ b/math/geogebra/pkg-plist
@@ -1,22 +1,61 @@
 bin/geogebra
 share/applications/geogebra.desktop
 share/icons/hicolor/32x32/apps/geogebra.png
 share/icons/hicolor/scalable/apps/geogebra.svg
 %%DATADIR%%/geogebra/OpenGeoProver.jar
+%%DATADIR%%/geogebra/carte-util.jar
+%%DATADIR%%/geogebra/commons-io.jar
+%%DATADIR%%/geogebra/commons-logging.jar
+%%DATADIR%%/geogebra/css4j-awt.jar
+%%DATADIR%%/geogebra/css4j.jar
+%%DATADIR%%/geogebra/echosvg-all.jar
+%%DATADIR%%/geogebra/echosvg-anim.jar
+%%DATADIR%%/geogebra/echosvg-awt-util.jar
+%%DATADIR%%/geogebra/echosvg-bridge.jar
+%%DATADIR%%/geogebra/echosvg-constants.jar
+%%DATADIR%%/geogebra/echosvg-css.jar
+%%DATADIR%%/geogebra/echosvg-dom.jar
+%%DATADIR%%/geogebra/echosvg-ext.jar
+%%DATADIR%%/geogebra/echosvg-extension.jar
+%%DATADIR%%/geogebra/echosvg-gui-util.jar
+%%DATADIR%%/geogebra/echosvg-gvt.jar
+%%DATADIR%%/geogebra/echosvg-i18n.jar
+%%DATADIR%%/geogebra/echosvg-parser.jar
+%%DATADIR%%/geogebra/echosvg-script.jar
+%%DATADIR%%/geogebra/echosvg-slideshow.jar
+%%DATADIR%%/geogebra/echosvg-svg-dom.jar
+%%DATADIR%%/geogebra/echosvg-svggen.jar
+%%DATADIR%%/geogebra/echosvg-svgpp.jar
+%%DATADIR%%/geogebra/echosvg-svgrasterizer.jar
+%%DATADIR%%/geogebra/echosvg-swing.jar
+%%DATADIR%%/geogebra/echosvg-transcoder.jar
+%%DATADIR%%/geogebra/echosvg-ttf2svg.jar
+%%DATADIR%%/geogebra/echosvg-util.jar
+%%DATADIR%%/geogebra/echosvg-xml.jar
 %%DATADIR%%/geogebra/geogebra.jar
 %%DATADIR%%/geogebra/geogebra_3d.jar
 %%DATADIR%%/geogebra/geogebra_algos.jar
 %%DATADIR%%/geogebra/geogebra_cas.jar
 %%DATADIR%%/geogebra/geogebra_export.jar
 %%DATADIR%%/geogebra/geogebra_gui.jar
-%%DATADIR%%/geogebra/geogebra_javascript.jar
 %%DATADIR%%/geogebra/geogebra_main.jar
 %%DATADIR%%/geogebra/geogebra_properties.jar
 %%DATADIR%%/geogebra/gluegen-rt-natives-linux-amd64.jar
 %%DATADIR%%/geogebra/gluegen-rt.jar
-%%DATADIR%%/geogebra/javagiac-linux64.jar
+%%DATADIR%%/geogebra/javagiac-natives-linux-amd64.jar
+%%DATADIR%%/geogebra/jclf-linear3.jar
+%%DATADIR%%/geogebra/jclf-text.jar
 %%DATADIR%%/geogebra/jlatexmath.jar
-%%DATADIR%%/geogebra/jogl.all-natives-linux-amd64.jar
-%%DATADIR%%/geogebra/jogl.all.jar
+%%DATADIR%%/geogebra/jogl-all-natives-linux-amd64.jar
+%%DATADIR%%/geogebra/jogl-all.jar
+%%DATADIR%%/geogebra/jsobject.jar
+%%DATADIR%%/geogebra/math-cross-platform.jar
+%%DATADIR%%/geogebra/rhino.jar
+%%DATADIR%%/geogebra/smil-api.jar
+%%DATADIR%%/geogebra/svgom-api.jar
+%%DATADIR%%/geogebra/tokenproducer.jar
+%%DATADIR%%/geogebra/xml-apis.jar
+%%DATADIR%%/geogebra/xml-dtd.jar
+%%DATADIR%%/geogebra/xmlgraphics-commons.jar
 share/mime/packages/geogebra-mime.xml
 @dir share/mime/packages