diff --git a/games/libretro-fbneo/Makefile b/games/libretro-fbneo/Makefile
index a48aa6800e85..72d7deec944f 100644
--- a/games/libretro-fbneo/Makefile
+++ b/games/libretro-fbneo/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	libretro-fbneo
-PORTVERSION=	0.20220406
+PORTVERSION=	0.20220925
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Final Burn Alpha fork for libretro
 WWW=		https://github.com/libretro/FBNeo
 
 LICENSE=	FBNeo
 LICENSE_NAME=	FBNeo
 LICENSE_FILE=	${WRKSRC}/src/license.txt
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-BROKEN=		does not build: non-const lvalue reference to type 'basic_ostringstream<...>' cannot bind to a temporary of type 'basic_ostringstream<...>'
-
 USES=		compiler:c11 gmake gl
-USE_LDCONFIG=	yes
-USE_GL=		gl
-
-PLIST_FILES=	lib/libretro/fbneo_libretro.so
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	FBNeo
-GH_TAGNAME=	01bf2e1
+GH_TAGNAME=	8678b0f
+
+USE_GL=		gl
+USE_LDCONFIG=	yes
 
 MAKEFILE=	Makefile.freebsd
 
+PLIST_FILES=	lib/libretro/fbneo_libretro.so
+
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
 	${INSTALL_LIB} ${WRKSRC}/src/burner/libretro/fbneo_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
 
 .include <bsd.port.mk>
diff --git a/games/libretro-fbneo/distinfo b/games/libretro-fbneo/distinfo
index 9850462bf739..25b117eb8382 100644
--- a/games/libretro-fbneo/distinfo
+++ b/games/libretro-fbneo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649324556
-SHA256 (libretro-FBNeo-0.20220406-01bf2e1_GH0.tar.gz) = f075ce5788cffdea2863aa2033aa4e2dc698d846243f280f8a2ae45cc7476cf5
-SIZE (libretro-FBNeo-0.20220406-01bf2e1_GH0.tar.gz) = 16543709
+TIMESTAMP = 1664108821
+SHA256 (libretro-FBNeo-0.20220925-8678b0f_GH0.tar.gz) = 75659a4dc5af7ae6f25da68b46142ef60276ffa1c32cc69eccfee62ae72bd314
+SIZE (libretro-FBNeo-0.20220925-8678b0f_GH0.tar.gz) = 18142123
diff --git a/games/libretro-fbneo/files/patch-src_burner_libretro_libretro-common_features_features__cpu.c b/games/libretro-fbneo/files/patch-src_burner_libretro_libretro-common_features_features__cpu.c
deleted file mode 100644
index 0526ca00ee10..000000000000
--- a/games/libretro-fbneo/files/patch-src_burner_libretro_libretro-common_features_features__cpu.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/burner/libretro/libretro-common/features/features_cpu.c.orig	2022-02-01 14:08:50 UTC
-+++ src/burner/libretro/libretro-common/features/features_cpu.c
-@@ -46,7 +46,7 @@
- #if defined(_XBOX360)
- #include <PPCIntrinsics.h>
- #elif !defined(__MACH__) && (defined(__POWERPC__) || defined(__powerpc__) || defined(__ppc__) || defined(__PPC64__) || defined(__powerpc64__))
--#ifndef _PPU_INTRINSICS_H	
-+#if !defined(_PPU_INTRINSICS_H) && defined(__linux__)
- #include <ppu_intrinsics.h>	
- #endif
- #elif defined(_POSIX_MONOTONIC_CLOCK) || defined(ANDROID) || defined(__QNX__) || defined(DJGPP)
-@@ -175,7 +175,7 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
-    time_ticks = (1000000 * tv_sec + tv_usec);
- #elif defined(GEKKO)
-    time_ticks = gettime();
--#elif !defined(__MACH__) && (defined(_XBOX360) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__) || defined(__PSL1GHT__) || defined(__PPC64__) || defined(__powerpc64__))
-+#elif !defined(__MACH__) && defined(_XBOX360)
-    time_ticks = __mftb();
- #elif (defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK > 0) || defined(__QNX__) || defined(ANDROID)
-    struct timespec tv = {0};