diff --git a/games/yquake2/Makefile b/games/yquake2/Makefile
index c9ae6bd5a296..29da8eacc1e0 100644
--- a/games/yquake2/Makefile
+++ b/games/yquake2/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	yquake2
-PORTVERSION=	8.10
+DISTVERSION=	8.60
 CATEGORIES=	games
 MASTER_SITES=	https://deponie.yamagi.org/quake2/
-DISTNAME=	quake2-${PORTVERSION}
+DISTNAME=	quake2-${DISTVERSION}
 
 MAINTAINER=	shamaz.mazum@gmail.com
 COMMENT=	Improved version of Icculus Quake II
 WWW=		https://www.yamagi.org/quake2/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # Quake II loads optional libraries via dlopen(3)
 BUILD_DEPENDS=	${LOCALBASE}/include/curl/curl.h:ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/lib/libcurl.so:ftp/curl
 
-USES=		gmake openal gl sdl tar:xz
+USES=		gl gmake openal sdl tar:xz
 USE_GL=		gl
 USE_SDL=	sdl2
 MAKE_ARGS=	VERBOSE=1 WITH_SYSTEMWIDE=yes \
 		WITH_SYSTEMDATADIR="${Q2DIR}" \
 		WITH_SYSTEMLIBDIR="${PREFIX}/lib/${PORTNAME}"
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/q2ded \
 		${STAGEDIR}${PREFIX}/bin/yq2ded
 	${INSTALL_PROGRAM} ${WRKSRC}/release/quake2 \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/baseq2
 	${INSTALL_LIB} ${WRKSRC}/release/baseq2/game.so \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/baseq2
 	${INSTALL_LIB} ${WRKSRC}/release/ref_*.so \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/doc/*.md \
 		${STAGEDIR}${DOCSDIR}
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 .include <bsd.port.mk>
diff --git a/games/yquake2/distinfo b/games/yquake2/distinfo
index a8e03b54aa0f..ad0450013447 100644
--- a/games/yquake2/distinfo
+++ b/games/yquake2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653801164
-SHA256 (quake2-8.10.tar.xz) = 93d625f67bd365d943113f6aa7c65f6fd2bd4c46c4ab77eedc4642735c143ea1
-SIZE (quake2-8.10.tar.xz) = 2138064
+TIMESTAMP = 1763917917
+SHA256 (quake2-8.60.tar.xz) = 8f684737a52a75c0a0c465ec26e6a5d0fdc1d495392ea83015aed84563f93e0f
+SIZE (quake2-8.60.tar.xz) = 2222192
diff --git a/games/yquake2/files/patch-Makefile b/games/yquake2/files/patch-Makefile
index 0d09f6f0be64..d86ad7e6424d 100644
--- a/games/yquake2/files/patch-Makefile
+++ b/games/yquake2/files/patch-Makefile
@@ -1,28 +1,28 @@
---- Makefile.orig	2022-01-22 08:51:28 UTC
+--- Makefile.orig	2025-09-14 05:35:31 UTC
 +++ Makefile
-@@ -251,10 +251,13 @@ endif
+@@ -253,10 +253,13 @@ override CFLAGS += -DSYSTEMWIDE
  # Systemwide installation.
  ifeq ($(WITH_SYSTEMWIDE),yes)
  override CFLAGS += -DSYSTEMWIDE
 -ifneq ($(WITH_SYSTEMDIR),"")
 -override CFLAGS += -DSYSTEMDIR=\"$(WITH_SYSTEMDIR)\"
 +ifneq ($(WITH_SYSTEMDATADIR),"")
 +override CFLAGS += -DSYSTEMDATADIR=\"$(WITH_SYSTEMDATADIR)\"
  endif
 +ifneq ($(WITH_SYSTEMLIBDIR),"")
 +override CFLAGS += -DSYSTEMLIBDIR=\"$(WITH_SYSTEMLIBDIR)\"
  endif
 +endif
  
  # ----------
  
-@@ -405,7 +408,8 @@ config:
- 	@echo "WITH_OPENAL = $(WITH_OPENAL)"
+@@ -429,7 +432,8 @@ config:
  	@echo "WITH_RPATH = $(WITH_RPATH)"
+ 	@echo "WITH_SDL3 = $(WITH_SDL3)"
  	@echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)"
 -	@echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)"
 +	@echo "WITH_SYSTEMDATADIR = $(WITH_SYSTEMDATADIR)"
 +	@echo "WITH_SYSTEMLIBDIR = $(WITH_SYSTEMLIBDIR)"
  	@echo "============================"
  	@echo ""
  
diff --git a/games/yquake2/files/patch-src_client_vid_vid.c b/games/yquake2/files/patch-src_client_vid_vid.c
index 18a7f8ff95f3..5f91a6050d4c 100644
--- a/games/yquake2/files/patch-src_client_vid_vid.c
+++ b/games/yquake2/files/patch-src_client_vid_vid.c
@@ -1,17 +1,17 @@
---- src/client/vid/vid.c.orig	2022-01-22 08:51:28 UTC
+--- src/client/vid/vid.c.orig	2025-09-14 05:35:31 UTC
 +++ src/client/vid/vid.c
-@@ -318,7 +318,13 @@ const char* lib_ext = "so";
+@@ -319,7 +319,13 @@ VID_GetRendererLibPath(const char *renderer, char *pat
  static void
  VID_GetRendererLibPath(const char *renderer, char *path, size_t len)
  {
 -	snprintf(path, len, "%sref_%s.%s", Sys_GetBinaryDir(), renderer, lib_ext);
-+	char *next_path;
++	char *next_path = NULL;
 +
 +	while ((next_path = FS_GetNextRawPath(next_path)) != NULL) {
 +		snprintf(path, len, "%s/ref_%s.%s", next_path, renderer, lib_ext);
 +		if (Sys_IsFile(path))
 +			break;
 +	}
  }
  
  /*
diff --git a/games/yquake2/files/patch-src_common_filesystem.c b/games/yquake2/files/patch-src_common_filesystem.c
index 827038394300..cccb308b3866 100644
--- a/games/yquake2/files/patch-src_common_filesystem.c
+++ b/games/yquake2/files/patch-src_common_filesystem.c
@@ -1,12 +1,12 @@
---- src/common/filesystem.c.orig	2022-01-22 08:51:28 UTC
+--- src/common/filesystem.c.orig	2025-09-14 05:35:31 UTC
 +++ src/common/filesystem.c
-@@ -2029,7 +2029,8 @@ void FS_BuildRawPath(void) {
+@@ -2131,7 +2131,8 @@ FS_BuildRawPath(void)
  	// binary compiled with SYSTEMWIDE (installed from
  	// packages), but no systemwide game data.
  #ifdef SYSTEMWIDE
 -	FS_AddDirToRawPath(SYSTEMDIR, false, false);
 +	FS_AddDirToRawPath(SYSTEMDATADIR, false, false);
 +	FS_AddDirToRawPath(SYSTEMLIBDIR, false, false);
  #endif
  
  	// The CD must be the last directory of the path,