diff --git a/devel/iaito/Makefile b/devel/iaito/Makefile
index 75ce2cda03d2..fb3ac8894285 100644
--- a/devel/iaito/Makefile
+++ b/devel/iaito/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	iaito
-DISTVERSION=	6.0.8
+DISTVERSION=	6.1.8
 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
 
 BROKEN_i386=	error: non-constant-expression cannot be narrowed from type 'const unsigned long long' to 'size_t' (aka 'unsigned int')
 
 LIB_DEPENDS=	libcapstone.so:devel/capstone \
 		libr_core.so:devel/radare2
 
 FLAVORS=		qt6 qt5
 FLAVOR?=		qt6
 ${FLAVOR}_PKGNAMESUFFIX=	-${FLAVOR}
 
 USES=		compiler:c++17-lang desktop-file-utils gl gmake pkgconfig \
 		qmake:no_configure
 USE_GITHUB=	yes
 GH_ACCOUNT=	radareorg
 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 \
 		 ${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${WRKSRC}/src/img/org.radare.iaito.svg \
 			${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/src/org.radare.iaito.appdata.xml \
 			${STAGEDIR}${PREFIX}/share/metainfo
 
 .include <bsd.port.mk>
diff --git a/devel/iaito/distinfo b/devel/iaito/distinfo
index 60d247a21383..3f4264e61528 100644
--- a/devel/iaito/distinfo
+++ b/devel/iaito/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1769249034
-SHA256 (radareorg-iaito-6.0.8_GH0.tar.gz) = d6446bffd944c316faa31dc1017aedf85528e6ecc755d7480cfda988f707f527
-SIZE (radareorg-iaito-6.0.8_GH0.tar.gz) = 2963132
+TIMESTAMP = 1783717749
+SHA256 (radareorg-iaito-6.1.8_GH0.tar.gz) = 94cd9540e1d3630cf448274fa5b8117ff280f45647b3ca4d82f15562ff1d0133
+SIZE (radareorg-iaito-6.1.8_GH0.tar.gz) = 2542391
diff --git a/devel/iaito/files/patch-Makefile b/devel/iaito/files/patch-Makefile
index ea8edf634450..0524750d9859 100644
--- a/devel/iaito/files/patch-Makefile
+++ b/devel/iaito/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	2024-05-24 00:09:14 UTC
+--- Makefile.orig	2026-06-23 16:23:30 UTC
 +++ Makefile
-@@ -19,7 +19,7 @@ endif
- ifeq ($(WANT_PYTHON_BINDINGS),1)
- QMAKE_FLAGS+=IAITO_ENABLE_PYTHON_BINDINGS=true
+@@ -23,7 +23,7 @@ endif
+ ifeq ($(WANT_CRASH_REPORTS),1)
+ QMAKE_FLAGS+=IAITO_ENABLE_CRASH_REPORTS=true
  endif
 -QMAKE_FLAGS+=PREFIX=$(PREFIX)
 +#QMAKE_FLAGS+=PREFIX=$(PREFIX)
- 
- all: iaito
- 
+ INDENT_IMAGE_NAME ?= clang-format-image
+ INDENT_IMAGE_TAG ?= llvm20
+ INDENT_IMAGE := $(INDENT_IMAGE_NAME):$(INDENT_IMAGE_TAG)
diff --git a/devel/iaito/files/patch-configure b/devel/iaito/files/patch-configure
index 459738c74b68..9182be7b2e19 100644
--- a/devel/iaito/files/patch-configure
+++ b/devel/iaito/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	2024-11-20 08:00:58 UTC
+--- configure.orig	2026-06-23 16:23:30 UTC
 +++ configure
-@@ -474,7 +474,7 @@ else
+@@ -494,7 +494,7 @@ else
  else
  case "$undefined_variable" in 0|"") echo ; echo "ERROR: Missing qmake6" >&2 ; echo ; exit 1 ;; esac; fi
  else
 -if [ "$HAVE_QMAKE" = "1" ]; then
 +if [ "$HAVE_QMAKE" = "1" -a "$WANT_QMAKE6" != "1" ]; then
  QMAKE_BIN="${QMAKE}"; fi; fi
  if [ "$QMAKE_BIN" = """" ]; then
  case "$undefined_variable" in 0|"") echo ; echo "ERROR: Missing qmake" >&2 ; echo ; exit 1 ;; esac; fi
diff --git a/devel/iaito/files/patch-src_lib__radare2.pri b/devel/iaito/files/patch-src_lib__radare2.pri
index b13f716240bf..9d91e9980ee8 100644
--- a/devel/iaito/files/patch-src_lib__radare2.pri
+++ b/devel/iaito/files/patch-src_lib__radare2.pri
@@ -1,13 +1,13 @@
---- src/lib_radare2.pri.orig	2024-05-24 00:09:14 UTC
+--- src/lib_radare2.pri.orig	2026-06-23 16:23:30 UTC
 +++ src/lib_radare2.pri
-@@ -78,8 +78,8 @@ win32 {
+@@ -76,8 +76,8 @@ win32 {
      equals(USE_PKGCONFIG, 1) {
          CONFIG += link_pkgconfig
         # PKGCONFIG += r_core
 -        R2_INCLUDEPATH = "$$system("bash -c 'pkg-config --variable=includedir r_core'")/libr"
 -        R2_INCLUDEPATH += "$$system("bash -c 'pkg-config --variable=includedir r_core'")/libr/sdb"
 +        R2_INCLUDEPATH = "$$system("sh -c 'pkg-config --variable=includedir r_core'")/libr"
 +        R2_INCLUDEPATH += "$$system("sh -c 'pkg-config --variable=includedir r_core'")/libr/sdb"
          INCLUDEPATH += $$R2_INCLUDEPATH
          LIBS += $$system("pkg-config --libs r_core")
      } else {