diff --git a/audio/yoshimi/Makefile b/audio/yoshimi/Makefile
index 80b885f86aaa..f579f09ea428 100644
--- a/audio/yoshimi/Makefile
+++ b/audio/yoshimi/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	yoshimi
-DISTVERSION=	2.3.5.2
+DISTVERSION=	2.3.6
 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 c156ae96eebe..6acd4336fdbc 100644
--- a/audio/yoshimi/distinfo
+++ b/audio/yoshimi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1762661628
-SHA256 (Yoshimi-yoshimi-2.3.5.2_GH0.tar.gz) = b642f490f0a52465fcabdeca47baa63af955163762ce46f70a54dfe361c4a8ca
-SIZE (Yoshimi-yoshimi-2.3.5.2_GH0.tar.gz) = 7575021
+TIMESTAMP = 1771216953
+SHA256 (Yoshimi-yoshimi-2.3.6_GH0.tar.gz) = b922dbcc1e722f409c27098261a011f437fc84f0074b1b4134d9da1b984d21df
+SIZE (Yoshimi-yoshimi-2.3.6_GH0.tar.gz) = 7578130
diff --git a/audio/yoshimi/files/patch-src_CMakeLists.txt b/audio/yoshimi/files/patch-src_CMakeLists.txt
index dc7592dfa60a..0b88757a7dbe 100644
--- a/audio/yoshimi/files/patch-src_CMakeLists.txt
+++ b/audio/yoshimi/files/patch-src_CMakeLists.txt
@@ -1,20 +1,29 @@
 - disable override of port-defined CMAKE_BUILD_TYPE and CXXFLAGS
 
---- src/CMakeLists.txt.orig	2022-09-11 04:00:10 UTC
+--- src/CMakeLists.txt.orig	2026-02-14 16:53:10 UTC
 +++ src/CMakeLists.txt
-@@ -263,6 +263,7 @@ else()
+@@ -272,6 +272,7 @@ endif ()
+     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -DNDEBUG ")
  endif ()
- set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
  
 +if (FALSE)
  if (BuildForDebug)
      set (CMAKE_BUILD_TYPE "Debug")
-     set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
-@@ -271,6 +272,7 @@ else()
-     set (CMAKE_BUILD_TYPE "Release")
-     set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
+     set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptions_Debug})
+@@ -281,6 +282,7 @@ endif ()
+     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)
diff --git a/audio/yoshimi/files/patch-src_globals.h b/audio/yoshimi/files/patch-src_globals.h
index 88d9808738da..eafca44b7f41 100644
--- a/audio/yoshimi/files/patch-src_globals.h
+++ b/audio/yoshimi/files/patch-src_globals.h
@@ -1,13 +1,13 @@
 - workaround for https://github.com/Yoshimi/yoshimi/issues/174
 
---- src/globals.h.orig	2023-05-29 08:38:23 UTC
+--- src/globals.h.orig	2026-02-14 16:53:10 UTC
 +++ src/globals.h
-@@ -117,7 +117,7 @@ typedef unsigned int  uint;
+@@ -123,7 +123,7 @@ using ushort = unsigned short;
  #define UNTITLED "No Title"
  
  #define DEFAULT_AUDIO jack_audio
 -#define DEFAULT_MIDI alsa_midi
 +#define DEFAULT_MIDI jack_midi
  
  #define FORCED_EXIT 16
  
diff --git a/audio/yoshimi/pkg-plist b/audio/yoshimi/pkg-plist
index 6828d1aa86f5..c6e867854c6a 100644
--- a/audio/yoshimi/pkg-plist
+++ b/audio/yoshimi/pkg-plist
@@ -1,14 +1,13 @@
 bin/yoshimi
 lib/lv2/yoshimi.lv2/manifest.ttl
 lib/lv2/yoshimi.lv2/yoshimi.ttl
 lib/lv2/yoshimi.lv2/yoshimi_lv2.so
 share/applications/yoshimi.desktop
 share/icons/hicolor/128x128/apps/yoshimi.png
 share/icons/hicolor/256x256/apps/yoshimi.png
 share/icons/hicolor/64x64/apps/yoshimi.png
 share/icons/hicolor/scalable/apps/yoshimi.svg
 share/icons/hicolor/scalable/apps/yoshimi_alt.svg
 share/man/man1/yoshimi.1.gz
-share/metainfo/yoshimi.appdata.xml
 share/metainfo/yoshimi.metainfo.xml
 share/pixmaps/yoshimi.png