diff --git a/graphics/krita-gmic-plugin/Makefile b/graphics/krita-gmic-plugin/Makefile
index ce74b0d39c0d..9f07dfd117e5 100644
--- a/graphics/krita-gmic-plugin/Makefile
+++ b/graphics/krita-gmic-plugin/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	gmic
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.3.0
+DISTVERSION=	3.6.4.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	https://github.com/vanyossi/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	krita-
 PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	KDE/${PKGBASE}/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Krita native plugin for G'MIC
 WWW=		https://github.com/vanyossi/gmic
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gmake:devel/gmake
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libkritaqmicinterface.so:graphics/krita \
-		libpng.so:graphics/png
+		libpng16.so:graphics/png
 
 USES=		cmake compiler:c++14-lang kde:5 pkgconfig qt:5 shebangfix xorg
 USE_KDE=	coreaddons ecm:build
 USE_QT=		core gui network widgets \
 		buildtools:build linguisttools:build qmake:build
 USE_XORG=	ice sm x11 xext
 
 SHEBANG_FILES=	translations/lrelease.sh \
 		translations/filters/csv2ts.sh \
 		translations/filters/ts2csv.sh
 
 CMAKE_ARGS=	-DGMIC_QT_HOST:STRING="krita-plugin"
 CMAKE_OFF=	ENABLE_SYSTEM_GMIC
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSIONFULL}
 WRKSRC_SUBDIR=	gmic-qt
 
 PLIST_FILES=	lib/kritaplugins/krita_gmic_qt.so \
 		share/gmic/gmic_cluts.gmz \
 		share/gmic/gmic_denoise_cnn.gmz
 
 .include <bsd.port.mk>
diff --git a/graphics/krita-gmic-plugin/distinfo b/graphics/krita-gmic-plugin/distinfo
index 1e4b658ff300..0a400f033611 100644
--- a/graphics/krita-gmic-plugin/distinfo
+++ b/graphics/krita-gmic-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741759245
-SHA256 (KDE/krita-gmic-plugin/3.5.3.0/gmic-3.5.3.0.tar.gz) = 64a913946a2c41c68c51018c3c21274b78b5a6cd8d75dd43f3b543b642a37d33
-SIZE (KDE/krita-gmic-plugin/3.5.3.0/gmic-3.5.3.0.tar.gz) = 20909283
+TIMESTAMP = 1766282335
+SHA256 (KDE/krita-gmic-plugin/3.6.4.1/gmic-3.6.4.1.tar.gz) = a6b6c69301560be2ea2b5583a8ec19bd7e50e4b41a977745517ce920bc05fafe
+SIZE (KDE/krita-gmic-plugin/3.6.4.1/gmic-3.6.4.1.tar.gz) = 21834300
diff --git a/graphics/krita-gmic-plugin/files/patch-CMakeLists.txt b/graphics/krita-gmic-plugin/files/patch-CMakeLists.txt
index fee865a8d5dd..74427219efe4 100644
--- a/graphics/krita-gmic-plugin/files/patch-CMakeLists.txt
+++ b/graphics/krita-gmic-plugin/files/patch-CMakeLists.txt
@@ -1,31 +1,35 @@
+Hunk 1: Don't find Qt6 until we can land a KF6-based Krita
+Hunk 2: Link to -lpthread
+Hunk 3: bmake doesn't work for this
+
 --- CMakeLists.txt.orig	2023-05-04 22:27:01 UTC
 +++ CMakeLists.txt
 @@ -153,7 +153,7 @@ find_package(Threads REQUIRED)
  #
  # Qt
  #
 -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 +find_package(QT NAMES Qt5 REQUIRED COMPONENTS Core)
  find_package(Qt${QT_VERSION_MAJOR} ${MIN_QT_VERSION}
          REQUIRED COMPONENTS
          Core
 @@ -328,6 +328,7 @@ if (UNIX)
          set(gmic_qt_LIBRARIES
              ${gmic_qt_LIBRARIES}
              ${X11_LIBRARIES} # XXX: Search for X11: Wayland is coming!
 +            Threads::Threads
          )
      endif()
  endif()
 @@ -645,9 +646,9 @@ if (UNIX OR APPLE OR MSYS)
  
  if (UNIX OR APPLE OR MSYS)
    message("Producing translation .qm files")
 -  execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations OUTPUT_QUIET)
 +  execute_process(COMMAND gmake WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations OUTPUT_QUIET)
    message("Producing filter translation .qm files")
 -  execute_process(COMMAND make WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations/filters OUTPUT_QUIET)
 +  execute_process(COMMAND gmake WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/translations/filters OUTPUT_QUIET)
  else()
    set(gmic_translation_files
        translations/cs.ts