diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index b0ca1a1cf3b9..cc54e45b7948 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -1,114 +1,114 @@
 
 PORTNAME=	yuzu
-PORTVERSION=	s20210421
+PORTVERSION=	s20210423
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	abf034785ed2.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4836
 PATCHFILES+=	d37bd764e826.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	d04bf0f3726d.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	098eed11d05e.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	931b5dfb8af9.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	b2330ec6a431.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	21e69958e168.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	ffc1b3a3dd67.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	f736f4a65bc0.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	09b61318aa4f.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 PATCHFILES+=	4c3d3bbd2ad4.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Nintendo Switch emulator/debugger
 
 LICENSE=	APACHE20 BSD3CLAUSE GPLv2+ ISCL LGPL21+ LGPL3+ MIT UNLICENSE
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/license.txt
 LICENSE_FILE_ISCL=	${WRKSRC}/externals/cubeb/LICENSE
 LICENSE_FILE_LGPL21+ =	${_LICENSE_STORE}/LGPL21 # soundtouch
 LICENSE_FILE_LGPL3+ =	${_LICENSE_STORE}/LGPL3 # sirit
 LICENSE_FILE_MIT=	${WRKSRC}/externals/sirit/externals/SPIRV-Headers/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64
 ONLY_FOR_ARCHS_REASON=	requires int128
 
 BUILD_DEPENDS=	catch>0:devel/catch \
 		nlohmann-json>0:devel/nlohmann-json \
 		glslangValidator:graphics/glslang
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libzstd.so:archivers/zstd \
 		libopus.so:audio/opus \
 		libboost_context.so:devel/boost-libs \
 		libavcodec.so:multimedia/ffmpeg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yuzu-emu
-GH_TAGNAME=	607ff3489
+GH_TAGNAME=	2e268abe4
 GH_TUPLE=	yuzu-emu:mbedtls:v2.16.9-52-geac2416b8:mbedtls/externals/mbedtls \
 		KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
 		KhronosGroup:Vulkan-Headers:v1.2.145:Vulkan_Headers/externals/Vulkan-Headers \
 		MerryMage:dynarmic:r4-219-gb2a4da5e:dynarmic/externals/dynarmic \
 		ReinUsesLisp:sirit:eefca56:sirit/externals/sirit \
 		arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
 		citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
 		fmtlib:fmt:7.1.2:fmt/externals/fmt \
 		herumi:xbyak:v5.96:xbyak/externals/xbyak \
 		nih-at:libzip:rel-1-5-2-93-g89bd6d63:libzip/externals/libzip/libzip \
 		kinetiknz:cubeb:cubeb-0.2-1298-g8d53747:cubeb/externals/cubeb \
 		benhoyt:inih:r52:inih/externals/inih/inih
 
 USES=		cmake compiler:c++17-lang localbase:ldflags sdl ssl
 USE_GCC=	yes:build # libc++ lacks std::atomic_ref, std::ranges
 USE_SDL=	sdl2
 CMAKE_OFF=	ENABLE_GNUTLS ENABLE_MBEDTLS
 LDFLAGS+=	-static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt
 LDFLAGS+=	-Wl,--as-needed # Qt5Network
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	ALSA PULSEAUDIO JACK SNDIO VULKAN
 OPTIONS_DEFAULT=PULSEAUDIO JACK SNDIO VULKAN
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
 
 ALSA_BUILD_DEPENDS=	alsa-lib>0:audio/alsa-lib
 ALSA_CMAKE_BOOL=	USE_ALSA
 
 JACK_BUILD_DEPENDS=	jackit>0:audio/jack
 JACK_CMAKE_BOOL=	USE_JACK
 
 PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
 SNDIO_BUILD_DEPENDS=	sndio>0:audio/sndio
 SNDIO_CMAKE_BOOL=	USE_SNDIO
 
 SDL_CMAKE_BOOL=	ENABLE_SDL2
 SDL_PLIST_FILES=bin/${PORTNAME}-cmd
 
 QT5_USES=	desktop-file-utils qt:5 shared-mime-info
 QT5_USE=	QT=qmake_build,buildtools_build,linguisttools_build,concurrent_build,core,gui,webengine,widgets
 QT5_CMAKE_BOOL=	ENABLE_QT ENABLE_QT_TRANSLATION YUZU_USE_QT_WEB_ENGINE
 QT5_PLIST_FILES=bin/${PORTNAME} \
 		share/applications/${PORTNAME}.desktop \
 		share/icons/hicolor/scalable/apps/${PORTNAME}.svg \
 		share/mime/packages/${PORTNAME}.xml
 
 VULKAN_DESC=		Vulkan renderer
 VULKAN_RUN_DEPENDS=	${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
 
 .if !exists(${.CURDIR:H:H}/www/qt5-webengine)
 # Temporarily disable web applet if qt5-webengine is missing
 QT5_USE:=		${QT5_USE:S/,webengine//}
 QT5_CMAKE_BOOL:=	${QT5_CMAKE_BOOL:N*WEB_ENGINE}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/check_submodules_present()/d' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
 		-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
 		${WRKSRC}/src/common/scm_rev.cpp.in
 
 .include <bsd.port.mk>
diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
index 600fbea488f1..f2e37eb43e8f 100644
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@@ -1,49 +1,49 @@
-TIMESTAMP = 1619040993
-SHA256 (yuzu-emu-yuzu-s20210421-607ff3489_GH0.tar.gz) = c890653a4723cc8751d222e701ed097bb5df26d9d8a203561774c63d21cc84ce
-SIZE (yuzu-emu-yuzu-s20210421-607ff3489_GH0.tar.gz) = 3795852
+TIMESTAMP = 1619218127
+SHA256 (yuzu-emu-yuzu-s20210423-2e268abe4_GH0.tar.gz) = 688b38988001fccf3e55422400fd3f80fef55546fe9c8d7f76105976b99f3015
+SIZE (yuzu-emu-yuzu-s20210423-2e268abe4_GH0.tar.gz) = 3795961
 SHA256 (yuzu-emu-mbedtls-v2.16.9-52-geac2416b8_GH0.tar.gz) = 8d3b480b4121feaa30f12fdec06de741775465454610202363edaf7564d4f3bb
 SIZE (yuzu-emu-mbedtls-v2.16.9-52-geac2416b8_GH0.tar.gz) = 2676404
 SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff
 SIZE (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 280829
 SHA256 (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = c8656969f0dc33f5f544b9449f02d66b7c9de67e6e58376c1cd4999694ab8517
 SIZE (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = 766896
 SHA256 (MerryMage-dynarmic-r4-219-gb2a4da5e_GH0.tar.gz) = 696ae92c3d515faef17b91d2dd0c306e62d89e959a6c802df8955ad5a8a88ffa
 SIZE (MerryMage-dynarmic-r4-219-gb2a4da5e_GH0.tar.gz) = 27446619
 SHA256 (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = cc95e8155e14e596526c378d0a3cc2bb4bfe7da68773a79f224d48f89b20685a
 SIZE (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = 22035
 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58
 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240
 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c
 SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514
 SHA256 (fmtlib-fmt-7.1.2_GH0.tar.gz) = 4119a1c34dff91631e1d0a3707428f764f1ea22fe3cd5e70af5b4ccd5513831c
 SIZE (fmtlib-fmt-7.1.2_GH0.tar.gz) = 769401
 SHA256 (herumi-xbyak-v5.96_GH0.tar.gz) = 727f15d3ed786cae255ebfed1829a84a357c0e4856c6304456d77f1b56c3d2c6
 SIZE (herumi-xbyak-v5.96_GH0.tar.gz) = 226999
 SHA256 (nih-at-libzip-rel-1-5-2-93-g89bd6d63_GH0.tar.gz) = 63050daee06c5bcf0f8fd82103e3e84e83772f3a646f42bfa3851afc7aca4ce1
 SIZE (nih-at-libzip-rel-1-5-2-93-g89bd6d63_GH0.tar.gz) = 1211650
 SHA256 (kinetiknz-cubeb-cubeb-0.2-1298-g8d53747_GH0.tar.gz) = b5cd93de1ca5c9810594a8ec9ac4a3f7c0014cb5d90827034839405a82553fba
 SIZE (kinetiknz-cubeb-cubeb-0.2-1298-g8d53747_GH0.tar.gz) = 218055
 SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880
 SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808
 SHA256 (abf034785ed2.patch) = 14704f7a15146ca03f958d119fa485d8265ea8201f06369bfe9453f49d9775f9
 SIZE (abf034785ed2.patch) = 11178
 SHA256 (d37bd764e826.patch) = 20e4cd888744e98f4cf84d9eef7649be0d2ad123673bd331f9004a9bf0a9add0
 SIZE (d37bd764e826.patch) = 5944
 SHA256 (d04bf0f3726d.patch) = f37978b6b8dc0db3c2122368e72fc0a9bda8b1fc74025ec01c9e12f72af15aa4
 SIZE (d04bf0f3726d.patch) = 11749
 SHA256 (098eed11d05e.patch) = 99a52b14914ee3178e5b555cbbe78db9b51cc9b51109cf6489867dcbee49e519
 SIZE (098eed11d05e.patch) = 6472
 SHA256 (931b5dfb8af9.patch) = 95e305c337d440e8f87abd67eff63fd03256f76a241757e9853fb5c74f98b8ad
 SIZE (931b5dfb8af9.patch) = 21968
 SHA256 (b2330ec6a431.patch) = 48016002a219483dacaafd5d0ecfa2e20abdbfdd03db2747be4d096efd1867cc
 SIZE (b2330ec6a431.patch) = 11925
 SHA256 (21e69958e168.patch) = af335daf474e5645bda2ba8a7a7febe112b13a60e9105581d4fb5b9d98d102ef
 SIZE (21e69958e168.patch) = 6679
 SHA256 (ffc1b3a3dd67.patch) = 9f6c8a107d1ab4c5811c10ea20b771f1f31dd5141086c23c5e537a6e664d31f0
 SIZE (ffc1b3a3dd67.patch) = 3670
 SHA256 (f736f4a65bc0.patch) = c4aac19b310cc7afe05450ec2aade85c7fac83774731d2885d19250b4645d1b9
 SIZE (f736f4a65bc0.patch) = 4700
 SHA256 (09b61318aa4f.patch) = b0b0b734581d9d0f2b28c71de67ee83ef113b2b052049a95fe1830b40ffa4d13
 SIZE (09b61318aa4f.patch) = 6093
 SHA256 (4c3d3bbd2ad4.patch) = 25877444f0908f1980b45cfe410471045a8f8778728fe54a481212699d8d240a
 SIZE (4c3d3bbd2ad4.patch) = 4616
diff --git a/emulators/yuzu/files/patch-boost b/emulators/yuzu/files/patch-boost
index 74ff53293b46..4d86a1e37dbd 100644
--- a/emulators/yuzu/files/patch-boost
+++ b/emulators/yuzu/files/patch-boost
@@ -1,23 +1,23 @@
 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=246106
 
 CMake Warning at /usr/local/share/cmake/Modules/FindBoost.cmake:2023 (message):
   No header defined for headers; skipping header check (note: header-only
   libraries have no designated component)
 Call Stack (most recent call first):
   CMakeLists.txt:199 (find_package)
 
 -- Boost 1.73.0 or newer not found, falling back to Conan
 -- Could NOT find Boost: Found unsuitable version "1.72.0", but required is at least "1.73" (found /usr/local/include)
 -- Packages boost/1.73.0 not found!
 
---- CMakeLists.txt.orig	2020-12-16 05:15:05 UTC
+--- CMakeLists.txt.orig	2021-04-23 22:48:47 UTC
 +++ CMakeLists.txt
-@@ -194,7 +194,7 @@ macro(yuzu_find_packages)
-     unset(FN_FORCE_REQUIRED)
+@@ -202,7 +202,7 @@ macro(yuzu_find_packages)
  endmacro()
  
--find_package(Boost 1.73.0 COMPONENTS context headers QUIET)
-+find_package(Boost 1.72.0 COMPONENTS context headers QUIET)
+ if (NOT YUZU_USE_BUNDLED_BOOST)
+-    find_package(Boost 1.73.0 COMPONENTS context headers QUIET)
++    find_package(Boost 1.72.0 COMPONENTS context headers QUIET)
+ endif()
  if (Boost_FOUND)
      set(Boost_LIBRARIES Boost::boost)
-     # Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it