diff --git a/games/moonlight-qt/Makefile b/games/moonlight-qt/Makefile
index 275d5d43694f..c152b8e1a9c5 100644
--- a/games/moonlight-qt/Makefile
+++ b/games/moonlight-qt/Makefile
@@ -1,56 +1,60 @@
 PORTNAME=	moonlight
 DISTVERSION=	6.0.1
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/moonlight-stream/moonlight-qt/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-qt
 DISTNAME=	MoonlightSrc-${DISTVERSIONFULL}
 
+PATCH_SITES=	https://github.com/moonlight-stream/moonlight-qt/commit/
+# Build fails on i386: https://github.com/moonlight-stream/moonlight-qt/issues/1367
+PATCHFILES+=	9e92c07cb7bce3591f43df2984f4e8dc61511c95.patch:-p1
+
 MAINTAINER=	lisp_25689@163.com
 COMMENT=	Gamestream client
 WWW=		https://github.com/moonlight-stream/moonlight-qt
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libopus.so:audio/opus \
 		libva.so:multimedia/libva \
 		libdrm.so:graphics/libdrm \
 		libvdpau.so:multimedia/libvdpau \
 		libplacebo.so:graphics/libplacebo \
 		libwayland-client.so:graphics/wayland
 
 USES=		desktop-file-utils gl localbase:ldflags pkgconfig \
 		qmake:outsource sdl ssl xorg
 USE_GL=		egl
 USE_SDL=	sdl2 ttf2
 USE_XORG=	x11
 
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/moonlight-qt \
 		share/applications/com.moonlight_stream.Moonlight.desktop \
 		share/metainfo/com.moonlight_stream.Moonlight.appdata.xml \
 		share/icons/hicolor/scalable/apps/moonlight.svg \
 
 OPTIONS_DEFAULT=	QT6
 QT5_DESC=	QT 5 toolkit support
 QT6_DESC=	QT 6 toolkit support
 OPTIONS_SINGLE=	QT
 OPTIONS_SINGLE_QT=	QT6 QT5
 QT5_USES=	qt:5
 QT5_USE=	qt=core,declarative,gui,network,quickcontrols2,svg,widgets,buildtools:build
 QT6_USES=	qt:6
 QT6_USE=	qt=base,declarative,svg
 
 post-patch:
 	@${REINPLACE_CMD} -e 's@Exec=moonlight.*@Exec=${PORTNAME}${PKGNAMESUFFIX}@' \
 		${WRKSRC}/app/deploy/linux/com.moonlight_stream.Moonlight.desktop
 	@${REINPLACE_CMD} -e 's@^    TARGET = moonlight.*@    TARGET = ${PORTNAME}${PKGNAMESUFFIX}@' \
 		${WRKSRC}/app/app.pro
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.mk>
diff --git a/games/moonlight-qt/distinfo b/games/moonlight-qt/distinfo
index 2ef4a1114303..af285490a390 100644
--- a/games/moonlight-qt/distinfo
+++ b/games/moonlight-qt/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1720010303
+TIMESTAMP = 1721910249
 SHA256 (MoonlightSrc-6.0.1.tar.gz) = c4e59b033f4cfa78c7af54213d1eec158bc1676472c358be61482375e1a38ee0
 SIZE (MoonlightSrc-6.0.1.tar.gz) = 83786545
+SHA256 (9e92c07cb7bce3591f43df2984f4e8dc61511c95.patch) = 0e17bf514b279a99dbe3c7cbaa548306f94026c759aa9a01e53100e585a3a50b
+SIZE (9e92c07cb7bce3591f43df2984f4e8dc61511c95.patch) = 973
diff --git a/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_plvk.h b/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_plvk.h
deleted file mode 100644
index 60440d150c4a..000000000000
--- a/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_plvk.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- app/streaming/video/ffmpeg-renderers/plvk.h.orig	2024-07-23 05:26:28 UTC
-+++ app/streaming/video/ffmpeg-renderers/plvk.h
-@@ -54,7 +54,11 @@ class PlVkRenderer : public IFFmpegRenderer { (private
-     // The libplacebo rendering state
-     pl_log m_Log = nullptr;
-     pl_vk_inst m_PlVkInstance = nullptr;
-+#if VK_USE_64_BIT_PTR_DEFINES == 1
-     VkSurfaceKHR m_VkSurface = nullptr;
-+#else
-+    VkSurfaceKHR m_VkSurface = 0;
-+#endif
-     pl_vulkan m_Vulkan = nullptr;
-     pl_swapchain m_Swapchain = nullptr;
-     pl_renderer m_Renderer = nullptr;