diff --git a/devel/iaito/Makefile b/devel/iaito/Makefile
index eef31254152c..2ef3c90f5acd 100644
--- a/devel/iaito/Makefile
+++ b/devel/iaito/Makefile
@@ -1,39 +1,56 @@
 PORTNAME=	iaito
 DISTVERSION=	5.9.2
 CATEGORIES=	devel
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Official QT frontend of radare2, a libre reverse engineering framework
 WWW=		https://github.com/radareorg/iaito
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libcapstone.so:devel/capstone \
 		libr_core.so:devel/radare2
 
-USES=		desktop-file-utils gl gmake pkgconfig qmake:no_configure qt:5
+FLAVORS=		qt5 qt6
+FLAVOR?=		${FLAVORS:[2]}
+qt5_PKGNAMESUFFIX=	-qt5
+qt6_PKGNAMESUFFIX=	-qt6
+
+USES=		compiler:c++17-lang desktop-file-utils gl gmake pkgconfig \
+		qmake:no_configure
 USE_GITHUB=	yes
 GH_ACCOUNT=	radareorg
-USE_GL=		gl
-USE_QT=		buildtools core gui linguisttools:build network svg widgets
 GNU_CONFIGURE=	yes
+
+.if ${FLAVOR} == qt5
+USES+=		qt:5
+USE_GL=		gl
+USE_QT=		core gui network svg widgets \
+		buildtools:build linguisttools:build qmake:build
+.else
+USES+=		qt:6
+USE_GL=		opengl
+USE_QT=		base svg
+CONFIGURE_ARGS=	--with-qmake6
+.endif
+
 MAKE_ENV=	DESTDIR=${STAGEDIR}${PREFIX} \
 		QMAKE_FLAGS="PREFIX=${STAGEDIR}${PREFIX}"
 
 PLIST_FILES=	bin/iaito \
 		share/applications/org.radare.iaito.desktop \
 		share/icons/hicolor/scalable/apps/org.radare.iaito.svg \
 		share/metainfo/org.radare.iaito.appdata.xml
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/org.radare.iaito.desktop \
 			${STAGEDIR}${DESKTOPDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/src/img/org.radare.iaito.svg \
 			${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${WRKSRC}/src/org.radare.iaito.appdata.xml \
 			${STAGEDIR}${PREFIX}/share/metainfo
 
 .include <bsd.port.mk>
diff --git a/devel/iaito/files/patch-configure b/devel/iaito/files/patch-configure
new file mode 100644
index 000000000000..8b0ba0dce3f1
--- /dev/null
+++ b/devel/iaito/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2024-05-24 00:09:14 UTC
++++ configure
+@@ -470,7 +470,7 @@ QMAKE=""; fi
+ fi ; fi
+ if [ "$WANT_QMAKE6" = "1" ]; then
+ QMAKE=""; fi
+-if [ "$HAVE_QMAKE" = "1" ]; then
++if [ "$HAVE_QMAKE" = "1" -a "$WANT_QMAKE6" != "1" ]; then
+ QMAKE_BIN="${QMAKE}"
+ else
+ if [ "$HAVE_QMAKE6" = "1" ]; then