diff --git a/ports-mgmt/packagekit-qt/Makefile b/ports-mgmt/packagekit-qt/Makefile
index a7b47958411b..30c132057089 100644
--- a/ports-mgmt/packagekit-qt/Makefile
+++ b/ports-mgmt/packagekit-qt/Makefile
@@ -1,7 +1,9 @@
 PORTNAME=	PackageKit-Qt
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt sysutils
 MASTER_SITES=	https://www.freedesktop.org/software/PackageKit/releases/
+PKGNAMESUFFIX=	${FLAVOR:S/qt//}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	DBUS packaging abstraction layer (Qt bindings)
@@ -12,11 +14,21 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/share/dbus-1/interfaces/org.freedesktop.PackageKit.xml:ports-mgmt/packagekit
 
-USES=		cmake cpe qt:5 tar:xz
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+USES=		cmake cpe qt:${FLAVOR:S/qt//} tar:xz
+_CMAKE_ARGS_qt5=	-DBUILD_WITH_QT6:BOOL=FALSE
+_CMAKE_ARGS_qt6=	-DBUILD_WITH_QT6:BOOL=TRUE
+CMAKE_ARGS=	${_CMAKE_ARGS_${FLAVOR}}
+_USE_QT_qt5=	core dbus buildtools:build qmake:build
+_USE_QT_qt6=	base
+USE_QT=		${_USE_QT_${FLAVOR}}
 
-USE_QT=		core dbus buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	packagekit_project
 
+PLIST_SUB=	QT_VER=${FLAVOR:S/qt//}
+
 .include <bsd.port.mk>
diff --git a/ports-mgmt/packagekit-qt/pkg-plist b/ports-mgmt/packagekit-qt/pkg-plist
index 6e713e71e48e..30d30df676cf 100644
--- a/ports-mgmt/packagekit-qt/pkg-plist
+++ b/ports-mgmt/packagekit-qt/pkg-plist
@@ -1,19 +1,19 @@
-include/packagekitqt5/PackageKit/Daemon
-include/packagekitqt5/PackageKit/Details
-include/packagekitqt5/PackageKit/Offline
-include/packagekitqt5/PackageKit/Transaction
-include/packagekitqt5/PackageKit/bitfield.h
-include/packagekitqt5/PackageKit/common.h
-include/packagekitqt5/PackageKit/daemon.h
-include/packagekitqt5/PackageKit/details.h
-include/packagekitqt5/PackageKit/offline.h
-include/packagekitqt5/PackageKit/packagekitqt_global.h
-include/packagekitqt5/PackageKit/transaction.h
-lib/cmake/packagekitqt5/PackageKitQtTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/packagekitqt5/PackageKitQtTargets.cmake
-lib/cmake/packagekitqt5/packagekitqt5-config-version.cmake
-lib/cmake/packagekitqt5/packagekitqt5-config.cmake
-lib/libpackagekitqt5.so
-lib/libpackagekitqt5.so.1
-lib/libpackagekitqt5.so.1.1.1
-libdata/pkgconfig/packagekitqt5.pc
+include/packagekitqt%%QT_VER%%/PackageKit/Daemon
+include/packagekitqt%%QT_VER%%/PackageKit/Details
+include/packagekitqt%%QT_VER%%/PackageKit/Offline
+include/packagekitqt%%QT_VER%%/PackageKit/Transaction
+include/packagekitqt%%QT_VER%%/PackageKit/bitfield.h
+include/packagekitqt%%QT_VER%%/PackageKit/common.h
+include/packagekitqt%%QT_VER%%/PackageKit/daemon.h
+include/packagekitqt%%QT_VER%%/PackageKit/details.h
+include/packagekitqt%%QT_VER%%/PackageKit/offline.h
+include/packagekitqt%%QT_VER%%/PackageKit/packagekitqt_global.h
+include/packagekitqt%%QT_VER%%/PackageKit/transaction.h
+lib/cmake/packagekitqt%%QT_VER%%/PackageKitQtTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/packagekitqt%%QT_VER%%/PackageKitQtTargets.cmake
+lib/cmake/packagekitqt%%QT_VER%%/packagekitqt%%QT_VER%%-config-version.cmake
+lib/cmake/packagekitqt%%QT_VER%%/packagekitqt%%QT_VER%%-config.cmake
+lib/libpackagekitqt%%QT_VER%%.so
+lib/libpackagekitqt%%QT_VER%%.so.1
+lib/libpackagekitqt%%QT_VER%%.so.1.1.1
+libdata/pkgconfig/packagekitqt%%QT_VER%%.pc