diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index f0ae476bd6b3..0a686b4f93f6 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,116 +1,115 @@
 PORTNAME=	kid3
-PORTVERSION=	3.9.3
-PORTREVISION=	4
+PORTVERSION=	3.9.4
 CATEGORIES=	audio kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Audio file tag editor
 WWW=		https://kid3.kde.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 LIB_DEPENDS=	libtag.so:audio/taglib
 
 FLAVORS=	qt5 qt6 kf5
 FLAVOR?=	${FLAVORS:[1]}
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gnome pkgconfig \
 		tar:xz
 USE_GNOME=	libxslt:build
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DWITH_DOCBOOKDIR="${LOCALBASE}/share/xsl/docbook" \
 		-DWITH_LIBDIR=lib \
 		-DWITH_MANDIR=man \
 		-DWITH_PLUGINSDIR=lib/kid3 \
 		-DFFMPEG_ROOT="${LOCALBASE}" \
 		-DWITH_APPS="${KID3_APPS:S/ /;/gW}"
 CMAKE_OFF=	WITH_ID3LIB \
 		WITH_MP4V2 \
 		WITH_QML
 CMAKE_ON=	WITH_TAGLIB
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION}
 
 .if ${FLAVOR} == qt5
 USES+=		qt:5
 USE_QT=		core dbus gui multimedia network xml widgets \
 		buildtools:build linguisttools:build qmake:build
-CMAKE_ON+=	WITH_QT5
+CMAKE_OFF+=	BUILD_WITH_QT6
 PLIST_SUB+=	KF5="@comment " \
 		QT="" \
 		QT_SUFX="-qt"
 KID3_APPS+=	QT
 .elif ${FLAVOR} == qt6
 USES+=		gl qt:6
 USE_GL=		opengl
 USE_QT=		base multimedia tools:build
-CMAKE_OFF+=	WITH_QT5
+CMAKE_ON+=	BUILD_WITH_QT6
 PLIST_SUB+=	KF5="@comment " \
 		QT="" \
 		QT_SUFX="-qt"
 KID3_APPS+=	QT
 .elif ${FLAVOR} == kf5
 USES+=		kde:5 qt:5
 USE_KDE=	auth codecs config configwidgets coreaddons kio \
 		service widgetsaddons xmlgui doctools:build ecm:build
 USE_QT=		concurrent core dbus gui multimedia network xml widgets \
 		buildtools:build linguisttools:build qmake:build
-CMAKE_ON+=	WITH_QT5
+CMAKE_OFF+=	BUILD_WITH_QT6
 PLIST_SUB+=	KF5="" \
 		QT="@comment " \
 		QT_SUFX=""
 KID3_APPS+=	KDE
 .endif
 
 .for f in ${FLAVORS}
 .  if ${FLAVOR} != ${f}
 CONFLICTS_INSTALL+=	kid3-${f}
 .  endif
 .endfor
 
 OPTIONS_DEFINE=		CLI ACOUSTID FLAC VORBIS TEST
 OPTIONS_DEFAULT=	CLI ACOUSTID FLAC VORBIS
 OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
 
 ACOUSTID_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint \
 			libavcodec.so:multimedia/ffmpeg
 ACOUSTID_CMAKE_BOOL=	WITH_CHROMAPRINT WITH_FFMPEG
 
 CLI_DESC=		Build and install command line utility
 CLI_USES=		python:test readline
 CLI_VARS=		KID3_APPS+=CLI
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_BOOL=	WITH_FLAC
 FLAC_IMPLIES=		VORBIS
 
 TEST_USE=		LOCALE=en_US.UTF-8
 .if ${FLAVOR} == qt5 || ${FLAVOR} == kf5
 TEST_USE+=		QT=testlib:build
 .endif
 TEST_CMAKE_BOOL=	BUILD_TESTING
 TEST_TARGET=		# define to override CMAKE_ARGS from Uses/kde.mk
 TEST_WRKSRC=		${BUILD_WRKSRC}/src/test
 TEST_VARS=		KID3_APPS+=TEST
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 VORBIS_CMAKE_BOOL=	WITH_VORBIS
 
 .include <bsd.port.options.mk>
 
 pre-test:
 	@${CP} ${WRKSRC}/src/test/*.py ${TEST_WRKSRC}
 
 do-test:
 	-@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ./kid3-test)
 
 do-test-CLI-on:
 	-@(cd ${TEST_WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHON_CMD} test_cli_functions.py)
 
 .include <bsd.port.mk>
diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo
index 74e0694ead92..42ba611810da 100644
--- a/audio/kid3/distinfo
+++ b/audio/kid3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673648673
-SHA256 (kid3-3.9.3.tar.xz) = 0f686b75e8f643af406230e7d84cb8bc148e9b3058dd4cd93147494918eeadd0
-SIZE (kid3-3.9.3.tar.xz) = 1820640
+TIMESTAMP = 1689017923
+SHA256 (kid3-3.9.4.tar.xz) = c410960e96225de0a1c4888c3ea1c6dc2ca245abb691474326dcdc3edbd6a520
+SIZE (kid3-3.9.4.tar.xz) = 1834140
diff --git a/audio/kid3/files/patch-CMakeLists.txt b/audio/kid3/files/patch-CMakeLists.txt
index 9e2d5dc014e0..55c0b58940c8 100644
--- a/audio/kid3/files/patch-CMakeLists.txt
+++ b/audio/kid3/files/patch-CMakeLists.txt
@@ -1,25 +1,13 @@
-Add CMake option to specify the version of Qt we want to build against.
+Fix detection of Qt5 if both Qt5 and Qt6 are installed.
 
---- CMakeLists.txt.orig	2022-09-12 03:46:59 UTC
+--- CMakeLists.txt.orig	2023-07-10 19:51:30 UTC
 +++ CMakeLists.txt
-@@ -27,6 +27,7 @@ set(BUILD_SHARED_LIBS ON CACHE BOOL "build shared libr
- cmake_minimum_required(VERSION 3.3)
- 
- set(BUILD_SHARED_LIBS ON CACHE BOOL "build shared libraries")
-+set(WITH_QT5    ON CACHE BOOL "build with Qt 5")
- set(WITH_QML    ON CACHE BOOL "build with QML")
- set(WITH_TAGLIB ON CACHE BOOL "build with TagLib")
- set(WITH_MP4V2 OFF CACHE BOOL "build with mp4v2")
-@@ -263,7 +264,11 @@ endif()
-     set(Qt${_qtVersionMajor}AndroidExtras_DIR "${_qtDir}/lib/cmake/Qt${_qtVersionMajor}AndroidExtras")
-   endif()
- endif()
--find_package(QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED)
-+if(WITH_QT5)
+@@ -273,7 +273,7 @@ else()
+ if(BUILD_WITH_QT6)
+   find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
+ else()
+-  find_package(QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED)
 +  find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED)
-+else()
-+  find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
-+endif()
+ endif()
  if(QT_VERSION_MAJOR EQUAL 6 AND QT_VERSION_MINOR LESS 2)
    set(WITH_MULTIMEDIA OFF)
- endif()