diff --git a/audio/mpz/Makefile b/audio/mpz/Makefile
index 917bf291ce40..f0d36900fd19 100644
--- a/audio/mpz/Makefile
+++ b/audio/mpz/Makefile
@@ -1,35 +1,48 @@
 PORTNAME=	mpz
-PORTVERSION=	2.1.2
+PORTVERSION=	2.1.6
 CATEGORIES=	audio
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Music player for big local collections
 WWW=		https://mpz-player.org/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
 		libtag.so:audio/taglib \
 		libyaml-cpp.so:devel/yaml-cpp
 
-USES=		cmake compiler:c++17-lang desktop-file-utils gstreamer qt:5
+USES=		cmake compiler:c++17-lang desktop-file-utils gstreamer
 USE_GITHUB=	yes
 GH_ACCOUNT=	olegantonyan
 USE_GSTREAMER=	flac libav mpg123 ogg opus vorbis
-USE_QT=		buildtools:build qmake:build concurrent core dbus gui \
-		multimedia network svg widgets
 
-CMAKE_ON=	USE_QT5 USE_SYSTEM_LIBMPDCLIENT USE_SYSTEM_QHOTKEY \
+CMAKE_ON=	USE_SYSTEM_LIBEBUR128 USE_SYSTEM_LIBMPDCLIENT \
+		USE_SYSTEM_QHOTKEY USE_SYSTEM_SQLITE3 \
 		USE_SYSTEM_TAGLIB USE_SYSTEM_YAMLCPP
 
-OPTIONS_DEFINE=	QHOTKEY
-OPTIONS_DEFAULT=	QHOTKEY
+OPTIONS_DEFINE=	GAPLESS QHOTKEY QT5
+OPTIONS_DEFAULT=	GAPLESS QHOTKEY
+QT5_PREVENTS=	GAPLESS
+
+GAPLESS_DESC=	Gapless playback support (implies Qt 6)
+GAPLESS_USES=	ebur128 sqlite
+GAPLESS_CMAKE_OFF=	-DENABLE_GAPLESS:BOOL=OFF
 
 QHOTKEY_DESC=	Global media-key hotkeys via QHotkey
-QHOTKEY_LIB_DEPENDS=	libqhotkey.so:x11-toolkits/qhotkey@qt5
+QHOTKEY_LIB_DEPENDS=	libqhotkey.so:x11-toolkits/qhotkey@${_QT_RELNAME}
 QHOTKEY_CMAKE_OFF=	-DENABLE_QHOTKEY:BOOL=OFF
 
+QT5_USES=	qt:5
+QT5_USES_OFF=	qt:6
+QT5_USE=	QT=buildtools:build,qmake:build \
+		QT=concurrent,core,dbus,gui,multimedia,network,svg,widgets
+QT5_USE_OFF=	QT=base,multimedia,svg
+QT5_CMAKE_ON=	-DUSE_QT5:BOOL=ON
+
 post-extract:
 	@${RM} -r ${WRKSRC}/3rdparty/[^i]*
 
 .include <bsd.port.mk>
+
+QT5_DESC+=	(default is Qt 6)
diff --git a/audio/mpz/distinfo b/audio/mpz/distinfo
index f8420ddd9118..18b392fdb874 100644
--- a/audio/mpz/distinfo
+++ b/audio/mpz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1785584906
-SHA256 (olegantonyan-mpz-2.1.2_GH0.tar.gz) = ed43362713bfad392bfcdba6987271698c9b623d5d3d7274a2a63d71977d0e62
-SIZE (olegantonyan-mpz-2.1.2_GH0.tar.gz) = 7084966
+TIMESTAMP = 1788376378
+SHA256 (olegantonyan-mpz-2.1.6_GH0.tar.gz) = f160218aa15f29b080ee08ade9fdaf9968ec31111a31895ade8b6bbc9a9d3f96
+SIZE (olegantonyan-mpz-2.1.6_GH0.tar.gz) = 10209048
diff --git a/audio/mpz/files/patch-CMakeLists.txt b/audio/mpz/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..24c7beb855ed
--- /dev/null
+++ b/audio/mpz/files/patch-CMakeLists.txt
@@ -0,0 +1,34 @@
+--- CMakeLists.txt.orig	2026-09-02 19:12:58 UTC
++++ CMakeLists.txt
+@@ -460,6 +460,7 @@ endif()
+ # ENDOF TAGLIB
+ 
+ # LIBEBUR128
++if (ENABLE_GAPLESS)
+ option(USE_SYSTEM_LIBEBUR128 "Use libebur128 provided by the OS" OFF)
+ if (USE_SYSTEM_LIBEBUR128)
+   find_library(EBUR128_LIBRARY ebur128 REQUIRED)
+@@ -501,7 +502,6 @@ endif()
+     target_include_directories(ebur128 PRIVATE ${EBUR128_SOURCE_DIR})
+   endif()
+ endif()
+-if (ENABLE_GAPLESS)
+   target_link_libraries(${MPZ_LIB} PUBLIC ebur128)
+ endif()
+ # ENDOF LIBEBUR128
+@@ -551,6 +551,7 @@ endif()
+ # ENDOF LIBMPDCLIENT
+ 
+ # SQLITE3
++if (ENABLE_GAPLESS)
+ option(USE_SYSTEM_SQLITE3 "Use sqlite3 provided by the OS" OFF)
+ if (USE_SYSTEM_SQLITE3)
+   message(STATUS "using system-wide sqlite3")
+@@ -566,7 +567,6 @@ endif()
+ else()
+   include(3rdparty/sqlite3.cmake)
+ endif()
+-if (ENABLE_GAPLESS)
+   target_link_libraries(${MPZ_LIB} PUBLIC sqlite3)
+ endif()
+ # ENDOF SQLITE3