diff --git a/devel/appstream-qt/Makefile b/devel/appstream-qt/Makefile
index 0b66b5af9037..9ed5507b3bf3 100644
--- a/devel/appstream-qt/Makefile
+++ b/devel/appstream-qt/Makefile
@@ -1,26 +1,14 @@
-PORTREVISION=	0
-PKGNAMESUFFIX=	Qt${FLAVOR:S/qt//}
+PORTREVISION=	1
+PKGNAMESUFFIX=	Qt6
 
 COMMENT?=	Qt bindings to AppStream
 
 LIB_DEPENDS=	libappstream.so:devel/appstream
 
-FLAVORS=	qt6 qt5
-FLAVOR?=	qt6
+USES=		qt:6
+USE_QT=		base
 
-USES=		qt:${FLAVOR:S/qt//}
-
-_USE_QT_qt5=	core buildtools:build qmake:build testlib:build
-_USE_QT_qt6=	base
-USE_QT=		${_USE_QT_${FLAVOR}}
-
-_MESON_ARGS_qt5=	-Dqt-versions='5'
-_MESON_ARGS_qt6=	-Dqt-versions='6'
-MESON_ARGS=		-Dqt=true ${_MESON_ARGS_${FLAVOR}}
-
-_QT_VER_SUFFIX_qt5=	5
-_QT_VER_SUFFIX_qt6=	#
-PLIST_SUB=	QT_VER_SUFFIX=${_QT_VER_SUFFIX_${FLAVOR}}
+MESON_ARGS=		-Dqt=true -Dqt-versions='6'
 
 MASTERDIR=	${.CURDIR}/../appstream
 PLIST=		${.CURDIR}/pkg-plist
diff --git a/devel/appstream-qt/pkg-plist b/devel/appstream-qt/pkg-plist
index bb6c58921cb4..723554228ee3 100644
--- a/devel/appstream-qt/pkg-plist
+++ b/devel/appstream-qt/pkg-plist
@@ -1,31 +1,31 @@
-include/AppStreamQt%%QT_VER_SUFFIX%%/appstreamqt_export.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/branding.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/bundle.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/category.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/component-box.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/component.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/contentrating.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/developer.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/icon.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/image.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/launchable.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/metadata.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/pool.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/provided.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/relation-check-result.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/relation.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/release-list.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/release.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/screenshot.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/spdx.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/suggested.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/systeminfo.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/translation.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/utils.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/version.h
-include/AppStreamQt%%QT_VER_SUFFIX%%/video.h
-lib/cmake/AppStreamQt%%QT_VER_SUFFIX%%/AppStreamQt%%QT_VER_SUFFIX%%Config.cmake
-lib/cmake/AppStreamQt%%QT_VER_SUFFIX%%/AppStreamQt%%QT_VER_SUFFIX%%ConfigVersion.cmake
-lib/libAppStreamQt%%QT_VER_SUFFIX%%.so
-lib/libAppStreamQt%%QT_VER_SUFFIX%%.so.1.0.4
-lib/libAppStreamQt%%QT_VER_SUFFIX%%.so.3
+include/AppStreamQt/appstreamqt_export.h
+include/AppStreamQt/branding.h
+include/AppStreamQt/bundle.h
+include/AppStreamQt/category.h
+include/AppStreamQt/component-box.h
+include/AppStreamQt/component.h
+include/AppStreamQt/contentrating.h
+include/AppStreamQt/developer.h
+include/AppStreamQt/icon.h
+include/AppStreamQt/image.h
+include/AppStreamQt/launchable.h
+include/AppStreamQt/metadata.h
+include/AppStreamQt/pool.h
+include/AppStreamQt/provided.h
+include/AppStreamQt/relation-check-result.h
+include/AppStreamQt/relation.h
+include/AppStreamQt/release-list.h
+include/AppStreamQt/release.h
+include/AppStreamQt/screenshot.h
+include/AppStreamQt/spdx.h
+include/AppStreamQt/suggested.h
+include/AppStreamQt/systeminfo.h
+include/AppStreamQt/translation.h
+include/AppStreamQt/utils.h
+include/AppStreamQt/version.h
+include/AppStreamQt/video.h
+lib/cmake/AppStreamQt/AppStreamQtConfig.cmake
+lib/cmake/AppStreamQt/AppStreamQtConfigVersion.cmake
+lib/libAppStreamQt.so
+lib/libAppStreamQt.so.1.0.4
+lib/libAppStreamQt.so.3