diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 8f1b25abbb9d..497d31359962 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -1,75 +1,76 @@
 PORTNAME=	xonotic
-PORTVERSION=	0.8.5
-PORTREVISION=	2
+PORTVERSION=	0.8.6
 CATEGORIES=	games
-MASTER_SITES=	http://nl.dl.xonotic.org/ \
-		http://mirror.bitmissile.com/xonotic/releases/
+MASTER_SITES=	https://dl.xonotic.org/ \
+		https://download.evil-ant-colony.org/xonotic/ \
+		https://xonotic.antzucaro.com/ \
+		https://ocv.xonotic.au/downloads/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Fast-paced, chaotic, and intense multiplayer first person shooter
-WWW=		https://www.xonotic.org/
+WWW=		https://xonotic.org/
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpng.so:graphics/png \
 		libd0_blind_id.so:security/d0_blind_id \
 		libd0_rijndael.so:security/d0_blind_id \
 		libode.so:devel/ode
 
 USES=		compiler:features gmake jpeg localbase shebangfix zip:infozip
 SHEBANG_FILES=	server/rcon.pl server/rcon2irc/rcon2irc.pl
 WRKSRC=		${WRKDIR}/Xonotic
 BUILD_WRKSRC=	${WRKSRC}/source/darkplaces
 MAKEFILE=	makefile
 MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" \
 		DP_PRELOAD_DEPENDENCIES=yes \
 		STRIP="${STRIP_CMD}"
 MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	# empty
 
 PORTDATA=	*
 
 OPTIONS_MULTI=		COMPONENTS
 OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED
 OPTIONS_DEFAULT=	CLIENT DEDICATED
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Build client
 CLIENT_LIB_DEPENDS=	libtheora.so:multimedia/libtheora \
 			libvorbis.so:audio/libvorbis \
 			libvorbisenc.so:audio/libvorbis \
 			libvorbisfile.so:audio/libvorbis \
 			libogg.so:audio/libogg
 CLIENT_USES=		sdl xorg
 CLIENT_USE=		SDL=sdl2 XORG=x11
 CLIENT_ALL_TARGET=	sdl-release
 
 DEDICATED_DESC=		Build dedicated server
 DEDICATED_ALL_TARGET=	sv-release
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \
 		${BUILD_WRKSRC}/makefile ${BUILD_WRKSRC}/makefile.inc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data
 	${INSTALL_DATA} ${WRKSRC}/data/*.pk3 ${STAGEDIR}${DATADIR}/data/
 	${INSTALL_DATA} ${WRKSRC}/key_0.d0pk ${STAGEDIR}${DATADIR}/
 
 do-install-CLIENT-on:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-sdl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/misc/logos/xonotic.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/
 	${INSTALL_DATA} ${WRKSRC}/misc/logos/xonotic_icon.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/xonotic.svg
 .for s in 16 22 24 32 48 64 128 256 512
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/
 	${INSTALL_DATA} ${WRKSRC}/misc/logos/icons_png/xonotic_${s}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/xonotic.png
 .endfor
 
 do-install-DEDICATED-on:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "server" ${STAGEDIR}${DATADIR}/
 # Fixup lost +x permissions on scripts after COPYTREE_SHARE
 	${FIND} ${STAGEDIR}${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \
 		${XARGS} ${CHMOD} +x
 
 .include <bsd.port.mk>
diff --git a/games/xonotic/distinfo b/games/xonotic/distinfo
index fbcf94b3343c..4a5e2f2bd4d0 100644
--- a/games/xonotic/distinfo
+++ b/games/xonotic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656693570
-SHA256 (xonotic-0.8.5.zip) = 0f92aa238362aeb059b9d9026a9bd38d6217423a35c19f126fb39e38736e37e5
-SIZE (xonotic-0.8.5.zip) = 1228561792
+TIMESTAMP = 1688474643
+SHA256 (xonotic-0.8.6.zip) = 50850f8d800e7499722f6ea61e478e96464a375494b5a24da93aa0598cbe964d
+SIZE (xonotic-0.8.6.zip) = 1238439495
diff --git a/games/xonotic/files/patch-source_darkplaces_makefile.inc b/games/xonotic/files/patch-source_darkplaces_makefile.inc
index 1101c2469db9..29d3697cd308 100644
--- a/games/xonotic/files/patch-source_darkplaces_makefile.inc
+++ b/games/xonotic/files/patch-source_darkplaces_makefile.inc
@@ -1,11 +1,11 @@
---- source/darkplaces/makefile.inc.orig	2022-06-27 17:32:38 UTC
+--- source/darkplaces/makefile.inc.orig	2023-04-30 08:22:32 UTC
 +++ source/darkplaces/makefile.inc
-@@ -194,7 +194,7 @@ OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
- #OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS)
+@@ -197,7 +197,7 @@ OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
  #OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS)
  #OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
--OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
-+OPTIM_RELEASE=${CFLAGS} -fno-strict-aliasing $(CPUOPTIMIZATIONS)
+ #OPTIM_RELEASE=-O3 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
+-OPTIM_RELEASE=-O3 -fno-strict-aliasing -fno-math-errno -fno-trapping-math $(CPUOPTIMIZATIONS)
++OPTIM_RELEASE=${CFLAGS} -fno-strict-aliasing -fno-math-errno -fno-trapping-math $(CPUOPTIMIZATIONS)
  # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag
  # Also, since gcc 5, -ffinite-math-only makes NaN and zero compare equal inside engine code but not inside QC, which causes error spam for seemingly valid QC code like if (x != 0) return 1 / x;