diff --git a/games/moonlight-qt/Makefile b/games/moonlight-qt/Makefile
index 14626d2d7fa7..275d5d43694f 100644
--- a/games/moonlight-qt/Makefile
+++ b/games/moonlight-qt/Makefile
@@ -1,45 +1,56 @@
 PORTNAME=	moonlight
-DISTVERSION=	5.0.1
+DISTVERSION=	6.0.1
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/moonlight-stream/moonlight-qt/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-qt
 DISTNAME=	MoonlightSrc-${DISTVERSIONFULL}
 
 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 qt:5 sdl ssl xorg
-USE_QT=		core declarative gui network quickcontrols2 svg widgets buildtools:build
+		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 f814d329b33a..2ef4a1114303 100644
--- a/games/moonlight-qt/distinfo
+++ b/games/moonlight-qt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698902927
-SHA256 (MoonlightSrc-5.0.1.tar.gz) = 901f875089fc5b2489cb45b5a33f00649f768555e760bdd5dfbaa8a05caebc98
-SIZE (MoonlightSrc-5.0.1.tar.gz) = 79820559
+TIMESTAMP = 1720010303
+SHA256 (MoonlightSrc-6.0.1.tar.gz) = c4e59b033f4cfa78c7af54213d1eec158bc1676472c358be61482375e1a38ee0
+SIZE (MoonlightSrc-6.0.1.tar.gz) = 83786545
diff --git a/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_drm.cpp b/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_drm.cpp
index 4068c7278a21..af100260b824 100644
--- a/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_drm.cpp
+++ b/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_drm.cpp
@@ -1,27 +1,27 @@
---- app/streaming/video/ffmpeg-renderers/drm.cpp.orig	2023-10-18 05:45:10 UTC
+--- app/streaming/video/ffmpeg-renderers/drm.cpp.orig	2024-06-06 03:42:28 UTC
 +++ app/streaming/video/ffmpeg-renderers/drm.cpp
-@@ -10,7 +10,24 @@ extern "C" {
+@@ -11,7 +11,24 @@ extern "C" {
  }
  
  #include <libdrm/drm_fourcc.h>
 +#ifdef __linux__
  #include <linux/dma-buf.h>
 +#else //bundle on BSDs
 +typedef uint64_t __u64;
 +// From https://github.com/evadot/drm-subtree or https://reviews.freebsd.org/D23085
 +struct dma_buf_sync {
 +    __u64 flags;
 +};
 +#define DMA_BUF_SYNC_READ      (1 << 0)
 +#define DMA_BUF_SYNC_WRITE     (2 << 0)
 +#define DMA_BUF_SYNC_RW        (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE)
 +#define DMA_BUF_SYNC_START     (0 << 2)
 +#define DMA_BUF_SYNC_END       (1 << 2)
 +#define DMA_BUF_SYNC_VALID_FLAGS_MASK \
 +    (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END)
 +#define DMA_BUF_BASE		'b'
 +#define DMA_BUF_IOCTL_SYNC	_IOW(DMA_BUF_BASE, 0, struct dma_buf_sync)
 +#endif
- #include <sys/ioctl.h>
  
  // Special Rockchip type
+ #ifndef DRM_FORMAT_NA12