diff --git a/audio/yoshimi/Makefile b/audio/yoshimi/Makefile
index f579f09ea428..3b3523884d39 100644
--- a/audio/yoshimi/Makefile
+++ b/audio/yoshimi/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	yoshimi
-DISTVERSION=	2.3.6
+DISTVERSION=	2.3.6.4
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Sophisticated software synthesizer
 WWW=		https://yoshimi.github.io/ \
 		https://github.com/yoshimi/yoshimi/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3 \
 		dssi>0:audio/dssi \
 		lv2>0:audio/lv2
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libfftw3f.so:math/fftw3-float \
 		libfltk.so:x11-toolkits/fltk \
 		libjack.so:audio/jack \
 		libmxml.so:textproc/mxml
 
 USES=		cmake compiler:c++17-lang desktop-file-utils gnome ncurses pkgconfig readline tar:bz2
 USE_GNOME=	cairo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yoshimi
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
 LDFLAGS+=		-Wl,--as-needed
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 # ALSA can also be enabled, but its build fails, see https://github.com/Yoshimi/yoshimi/issues/175
 
 .include <bsd.port.mk>
diff --git a/audio/yoshimi/distinfo b/audio/yoshimi/distinfo
index 6acd4336fdbc..f4e8d333670c 100644
--- a/audio/yoshimi/distinfo
+++ b/audio/yoshimi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1771216953
-SHA256 (Yoshimi-yoshimi-2.3.6_GH0.tar.gz) = b922dbcc1e722f409c27098261a011f437fc84f0074b1b4134d9da1b984d21df
-SIZE (Yoshimi-yoshimi-2.3.6_GH0.tar.gz) = 7578130
+TIMESTAMP = 1782617335
+SHA256 (Yoshimi-yoshimi-2.3.6.4_GH0.tar.gz) = dd6757574df41f4d1297e549fef6a565e62aa7fc42a8fc24641d56bdbe4018f4
+SIZE (Yoshimi-yoshimi-2.3.6.4_GH0.tar.gz) = 7577848
diff --git a/audio/yoshimi/files/patch-src_CMakeLists.txt b/audio/yoshimi/files/patch-src_CMakeLists.txt
index 0b88757a7dbe..f5aeccd43a66 100644
--- a/audio/yoshimi/files/patch-src_CMakeLists.txt
+++ b/audio/yoshimi/files/patch-src_CMakeLists.txt
@@ -1,29 +1,20 @@
 - disable override of port-defined CMAKE_BUILD_TYPE and CXXFLAGS
 
---- src/CMakeLists.txt.orig	2026-02-14 16:53:10 UTC
+--- src/CMakeLists.txt.orig	2026-06-13 21:04:15 UTC
 +++ src/CMakeLists.txt
 @@ -272,6 +272,7 @@ endif ()
      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DNDEBUG ")
  endif ()
  
 +if (FALSE)
  if (BuildForDebug)
      set (CMAKE_BUILD_TYPE "Debug")
      set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptions_Debug})
-@@ -281,6 +282,7 @@ endif ()
+@@ -280,6 +281,7 @@ else()
+     set (CMAKE_BUILD_TYPE "Release")
      set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptions_Release})
      message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
- endif ()
 +endif ()
+ endif ()
  
  configure_file(
-     "${CMAKE_CURRENT_SOURCE_DIR}/../desktop/yoshimi.desktop.in"
-@@ -548,8 +550,6 @@ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../desktop/
- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../desktop/yoshimi_alt.svg
-     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../desktop/metainfo/yoshimi.metainfo.xml
--    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
--install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../desktop/metainfo/yoshimi.appdata.xml
-     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../desktop/yoshimi.1
-     DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)