diff --git a/emulators/Ymir/Makefile b/emulators/Ymir/Makefile
index 189eb6ec438c..b6cfa0301e45 100644
--- a/emulators/Ymir/Makefile
+++ b/emulators/Ymir/Makefile
@@ -1,94 +1,93 @@
 PORTNAME=	Ymir
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.6
+DISTVERSION=	0.1.7
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
 COMMENT=	Sega Saturn emulator
 WWW=		https://github.com/StrikerX3/Ymir/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_aarch64=		https://github.com/StrikerX3/Ymir/pull/389 \
-			https://github.com/StrikerX3/Ymir/pull/421 \
-			https://github.com/llvm/llvm-project/issues/69524
 ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	upstream only supports aarch64 and amd64
 
 BUILD_DEPENDS=	cereal>0:devel/cereal \
 		concurrentqueue>0:devel/concurrentqueue \
 		cxxopts>0:devel/cxxopts \
 		glslangValidator:graphics/glslang \
 		glslc:graphics/shaderc \
 		stb>0:devel/stb \
 		tomlplusplus>0:devel/tomlplusplus \
 		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libchdr.so:devel/libchdr \
 		libfmt.so:devel/libfmt \
 		libglfw.so:graphics/glfw \
 		libimgui.so:x11-toolkits/imgui \
 		liblz4.so:archivers/liblz4 \
 		librtmidi.so:audio/rtmidi \
 		libvulkan.so:graphics/vulkan-loader \
 		libxxhash.so:devel/xxhash
 
 FLAVORS=			gtk3 gtk4
 FLAVOR?=			${FLAVORS:[1]}
 gtk4_PKGNAMESUFFIX=		-gtk4
 _gtk3_BR_DEPENDS=		zenity:x11/zenity
 _gtk4_BR_DEPENDS=		zenity:x11/zenity4
 ${FLAVOR}_BUILD_DEPENDS=	${_${FLAVOR}_BR_DEPENDS}
 ${FLAVOR}_RUN_DEPENDS=		${_${FLAVOR}_BR_DEPENDS}
 
-USES=		cmake compiler:c++20-lang gl llvm pkgconfig sdl xorg
+USES=		cmake compiler:c++20-lang desktop-file-utils gl \
+		llvm${_LLVM_${ARCH}} pkgconfig sdl xorg
+_LLVM_aarch64=	:min=21
 USE_GITHUB=	yes
 GH_ACCOUNT=	StrikerX3
 GH_TUPLE=	StrikerX3:mio:c9dbe3a6f74b2c2c4a6c9621005c3df213a33eaa:mio/vendor/mio
 USE_GL=		glut
 USE_SDL=	sdl3
 USE_XORG=	xi xmu
 
 CMAKE_OFF=	Ymir_DEV_BUILD \
 		Ymir_ENABLE_IMGUI_DEMO \
 		Ymir_ENABLE_SANDBOX \
 		Ymir_ENABLE_TESTS \
 		Ymir_INCLUDE_PACKAGING \
 		Ymir_SHARED_LIBS
 
 CFLAGS+=	-I${LOCALBASE}/include/concurrentqueue/moodycamel \
 		-I${LOCALBASE}/include/stb \
 		-I${WRKSRC}/vendor/imgui/ymir
 
 PLIST_FILES=	bin/ymir-sdl3 \
 		share/applications/io.github.strikerx3.ymir.desktop \
 		share/icons/hicolor/256x256/apps/ymir.png \
 		share/metainfo/io.github.strikerx3.ymir.xml
 
 OPTIONS_DEFINE=		LTO YMDASM
 OPTIONS_DEFAULT=	LTO
 
 YMDASM_DESC=		Include Ymir disassembly tool
 
 LTO_CMAKE_BOOL=		Ymir_ENABLE_IPO
 
 YMDASM_CMAKE_BOOL=	Ymir_ENABLE_YMDASM
 YMDASM_PLIST_FILES=	bin/ymdasm
 
 post-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/apps/ymir-sdl3/ymir-sdl3-${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/bin/ymir-sdl3
 	${INSTALL_DATA} ${WRKSRC}/apps/ymir-sdl3/res/io.github.strikerx3.ymir.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps \
 		 ${STAGEDIR}${PREFIX}/share/metainfo
 	${INSTALL_DATA} ${WRKSRC}/apps/ymir-sdl3/res/ymir.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps
 	${INSTALL_DATA} ${WRKSRC}/apps/ymir-sdl3/res/io.github.strikerx3.ymir.xml \
 		${STAGEDIR}${PREFIX}/share/metainfo
 
 post-install-YMDASM-on:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/apps/ymdasm/ymdasm-${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/bin/ymdasm
 
 .include <bsd.port.mk>
diff --git a/emulators/Ymir/distinfo b/emulators/Ymir/distinfo
index b691a23ad4f4..78b5b3eb2cee 100644
--- a/emulators/Ymir/distinfo
+++ b/emulators/Ymir/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1754444444
-SHA256 (StrikerX3-Ymir-v0.1.6_GH0.tar.gz) = 810b445dff2b9c1d055e9d701cfac3d9fc90edeb95e72e985d864e8acd7c5f37
-SIZE (StrikerX3-Ymir-v0.1.6_GH0.tar.gz) = 4842645
+TIMESTAMP = 1754870707
+SHA256 (StrikerX3-Ymir-v0.1.7_GH0.tar.gz) = 8453407de50a4abef05c985f4eabf32b5185bf5a651583d250f820ff60bae93a
+SIZE (StrikerX3-Ymir-v0.1.7_GH0.tar.gz) = 5431708
 SHA256 (StrikerX3-mio-c9dbe3a6f74b2c2c4a6c9621005c3df213a33eaa_GH0.tar.gz) = 384d3a3ee249ebda0766fa5dc9f8bc5a871c8b2e3d3eedf46f330e6350058738
 SIZE (StrikerX3-mio-c9dbe3a6f74b2c2c4a6c9621005c3df213a33eaa_GH0.tar.gz) = 34871
diff --git a/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_app.cpp b/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_app.cpp
index 8cf268ad80d7..fc08ed1ec905 100644
--- a/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_app.cpp
+++ b/emulators/Ymir/files/patch-apps_ymir-sdl3_src_app_app.cpp
@@ -1,33 +1,13 @@
---- apps/ymir-sdl3/src/app/app.cpp.orig	2025-07-20 22:35:27 UTC
+--- apps/ymir-sdl3/src/app/app.cpp.orig	2025-08-11 00:12:19 UTC
 +++ apps/ymir-sdl3/src/app/app.cpp
-@@ -108,8 +108,8 @@
- #include <SDL3/SDL_filesystem.h>
+@@ -114,8 +114,8 @@
+ #include <SDL3/SDL_messagebox.h>
  #include <SDL3/SDL_misc.h>
  
 -#include <backends/imgui_impl_sdl3.h>
 -#include <backends/imgui_impl_sdlrenderer3.h>
 +#include <imgui_impl_sdl3.h>
 +#include <imgui_impl_sdlrenderer3.h>
  
  #include <imgui.h>
  
-@@ -1898,8 +1898,18 @@ void App::RunEmulator() {
-                                                       actions::save_states::GetLoadStateAction(i),
-                                                       actions::save_states::GetSaveStateAction(i));
-
-+#if FMT_VERSION < 110000
-+                                char timeStr[20];
-+                                tm timeTm = util::to_local_time(state.timestamp);
-+                                if (!strftime(timeStr, sizeof(timeStr), "%F %T", &timeTm)) {
-+                                    memset(timeStr, 0, sizeof(timeStr));
-+                                }
-+#else
-+                                tm timeStr = util::to_local_time(state.timestamp);
-+#endif
-+
-                                 if (ImGui::MenuItem(
--                                        fmt::format("{}: {}", i, util::to_local_time(state.timestamp)).c_str(),
-+                                        fmt::format("{}: {}", i, timeStr).c_str(),
-                                         shortcut.c_str(), m_context.currSaveStateSlot == i, true)) {
-                                     if (io.KeyShift) {
-                                         SaveSaveStateSlot(i);