diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	fceux
-DISTVERSION=	2.6.4
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.6.5
 CATEGORIES=	emulators games
-MASTER_SITES=	SF/fceultra/Source%20Code/${DISTVERSION}%20src/
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	NES emulator
@@ -18,6 +17,9 @@
 USE_QT=		buildtools:build core gui opengl qmake:build widgets
 USE_SDL=	sdl2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	TASEmulators
+
 CFLAGS+=	-DPUBLIC_RELEASE
 CMAKE_ON=	GLVND
 
@@ -29,7 +31,7 @@
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 
-post-patch:
+pre-configure:
 	${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fceux.desktop
 	${REINPLACE_CMD} -e 's:%%PKGNAME%%:${PKGNAME}:' ${WRKSRC}/scripts/genGitHdr.sh
 	${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/src/drivers/Qt/HelpPages.cpp
@@ -41,6 +43,6 @@
 	${RM} ${STAGEDIR}${DATADIR}/*.dll
 	${RM} ${STAGEDIR}${DATADIR}/*.chm
 	# currently broken and not shipped
-	${RM} ${STAGEDIR}${PREFIX}/man/man6/fceux-net-server.6
+	${RM} ${STAGEDIR}${PREFIX}/share/man/man6/fceux-net-server.6
 
 .include <bsd.port.mk>
diff --git a/emulators/fceux/distinfo b/emulators/fceux/distinfo
--- a/emulators/fceux/distinfo
+++ b/emulators/fceux/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648120308
-SHA256 (fceux-2.6.4.tar.gz) = cc2f153076af0969cec2d8ab33077af98f820ef89bfcea7f72c50cb2c2a22df6
-SIZE (fceux-2.6.4.tar.gz) = 23372193
+TIMESTAMP = 1676212323
+SHA256 (TASEmulators-fceux-v2.6.5_GH0.tar.gz) = 78156f3685c55849351178773940871ed607bc4fc37f233fdab58c232e3208fa
+SIZE (TASEmulators-fceux-v2.6.5_GH0.tar.gz) = 23299626
diff --git a/emulators/fceux/files/patch-src_drivers_Qt_keyscan.cpp b/emulators/fceux/files/patch-src_drivers_Qt_keyscan.cpp
new file mode 100644
--- /dev/null
+++ b/emulators/fceux/files/patch-src_drivers_Qt_keyscan.cpp
@@ -0,0 +1,11 @@
+--- src/drivers/Qt/keyscan.cpp.orig	2023-02-13 00:05:10 UTC
++++ src/drivers/Qt/keyscan.cpp
+@@ -46,7 +46,7 @@ static uint32_t AltKeyCodeR   = VK_RMENU;
+ static uint32_t MetaKeyCodeR  = VK_RWIN;
+ static BYTE keyBuf[256];
+ 
+-#elif  defined(__linux__)
++#elif  defined(__linux__) || defined(__FreeBSD__)
+ 
+    #if  defined(_HAS_XKB)
+ 	#include <xkbcommon/xkbcommon.h>
diff --git a/emulators/fceux/pkg-plist b/emulators/fceux/pkg-plist
--- a/emulators/fceux/pkg-plist
+++ b/emulators/fceux/pkg-plist
@@ -1,7 +1,6 @@
 bin/fceux
 share/applications/fceux.desktop
 share/man/man6/fceux.6.gz
-share/man/man6/fceux-net-server.6.gz
 %%PORTDOCS%%%%DATADIR%%/fceux.qch
 %%PORTDOCS%%%%DATADIR%%/fceux.qhc
 %%PORTDOCS%%%%DATADIR%%/fceux.qhp