diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 4f1f30740b3a..e6887ddf80cb 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -1,98 +1,98 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.16-12386 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g2dc6adc03
+DISTVERSION=	0.0.16-12392 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-gdfbd63df9
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PS3 emulator/debugger
 
 LICENSE=	APACHE20 GPLv2 MIT ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE_MIT=	${WRKSRC_pugixml}/LICENSE.md
 LICENSE_FILE_ZLIB=	${WRKSRC_asmjit}/LICENSE.md
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpng.so:graphics/png \
 		libavcodec.so:multimedia/ffmpeg
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	requires int128 and SSE2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-125-g01f601a:hidapi/3rdparty/hidapi/hidapi \
 		RPCS3:llvm-mirror:5836324d6443:llvm/llvm \
 		Cyan4973:xxHash:v0.8.0:xxHash/3rdparty/xxHash \
 		FNA-XNA:FAudio:21.04:FAudio/3rdparty/FAudio \
 		asmjit:asmjit:723f585:asmjit/3rdparty/asmjit/asmjit \
 		google:flatbuffers:v1.11.0:flatbuffers/3rdparty/flatbuffers \
 		jbeder:yaml-cpp:yaml-cpp-0.6.3-30-g6a211f0:yamlcpp/3rdparty/yaml-cpp \
 		KhronosGroup:SPIRV-Headers:1.5.3.reservations1:spirv_headers/3rdparty/SPIRV/SPIRV-Headers \
 		KhronosGroup:SPIRV-Tools:v2020.4:spirv_tools/3rdparty/SPIRV/SPIRV-Tools \
 		KhronosGroup:glslang:11.4.0:glslang/3rdparty/glslang/glslang \
 		wolfSSL:wolfssl:v4.5.0-stable-80-g39b544860:wolfssl/3rdparty/wolfssl \
 		zeux:pugixml:v1.11.4:pugixml/3rdparty/pugixml
 
 USES=		cmake compiler:c++17-lang gl iconv:wchar_t localbase:ldflags \
 		openal:soft pkgconfig python:3.4+,build qt:5 xorg
 USE_GL=		gl glew
 USE_QT=		qmake_build buildtools_build core concurrent dbus gui widgets
 USE_XORG=	x11
 CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
 CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS
 LDFLAGS+=	-Wl,--as-needed # GLU
 
 OPTIONS_DEFINE=	ALSA EVDEV FAUDIO PULSEAUDIO VULKAN
 OPTIONS_DEFAULT=EVDEV FAUDIO VULKAN
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_CMAKE_BOOL=	USE_ALSA
 
 EVDEV_DESC=		libevdev-based joystick support
 EVDEV_CMAKE_BOOL=	USE_LIBEVDEV
 EVDEV_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 EVDEV_LIB_DEPENDS=	libevdev.so:devel/libevdev
 
 FAUDIO_DESC=		FAudio audio support
 FAUDIO_USES=		sdl
 FAUDIO_USE=		SDL=sdl2
 FAUDIO_CMAKE_BOOL=	USE_FAUDIO
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
 VULKAN_DESC=		Vulkan renderer
 VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_CMAKE_BOOL=	USE_VULKAN
 
 post-patch:
 	@${REINPLACE_CMD} -e '/GIT_BRANCH/s/local_build/master/' \
 		 -e '/GIT_FULL_BRANCH/s/local_build/${GH_ACCOUNT}\/${GH_PROJECT}\/master/' \
 		-e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \
 		${WRKSRC}/${PORTNAME}/git-version.cmake
 
 .include <bsd.port.pre.mk>
 
 # Ignore Mk/bsd.default-versions.mk but respect make.conf(5)
 .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*}
 LLVM_DEFAULT=	12 # bump if not latest release
 .endif
 BUILD_DEPENDS+=	clang++${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 USES:=		${USES:Ncompiler*}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}
 CPP=		clang-cpp${LLVM_DEFAULT}
 
 # XXX Drop after FreeBSD 12.2 EOL
 .if make(makesum) || (!exists(/usr/include/c++/v1/__bits) && exists(/usr/lib/libc++.so))
 MASTER_SITES+=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx
 DISTFILES+=	libcxx-${LLVM_VER}.src.tar.xz:libcxx
 CXXFLAGS+=	-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include
 LLVM_VER=	12.0.0
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index f2ecbb733363..c0efe9133086 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,29 +1,29 @@
-TIMESTAMP = 1623277444
+TIMESTAMP = 1623428121
 SHA256 (libcxx-12.0.0.src.tar.xz) = 7dcb75ca4f6aae2c677d128460c48a57398c8b6791b77b74bea7cf9e04e7c3f1
 SIZE (libcxx-12.0.0.src.tar.xz) = 1880864
-SHA256 (RPCS3-rpcs3-v0.0.16-12386-g2dc6adc03_GH0.tar.gz) = e447935ef4d1daa1f3ff461e3415387e6b147f47ae182fa55698112fc35b3f82
-SIZE (RPCS3-rpcs3-v0.0.16-12386-g2dc6adc03_GH0.tar.gz) = 8065690
+SHA256 (RPCS3-rpcs3-v0.0.16-12392-gdfbd63df9_GH0.tar.gz) = 9003e6f8f4586a7ecfa98c50a675c2b059fd5ca871ac03bd3397d6e299920bb6
+SIZE (RPCS3-rpcs3-v0.0.16-12392-gdfbd63df9_GH0.tar.gz) = 8066587
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-125-g01f601a_GH0.tar.gz) = d6aecf7a9e4d6f4935f1da5fd29cb8011f76567c8e5b571b7410e2fa6942bf37
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-125-g01f601a_GH0.tar.gz) = 120327
 SHA256 (RPCS3-llvm-mirror-5836324d6443_GH0.tar.gz) = b996a126f5d1beb558d63fb79005cf193c591cf8787dd86bcdb1f289f817e964
 SIZE (RPCS3-llvm-mirror-5836324d6443_GH0.tar.gz) = 27243918
 SHA256 (Cyan4973-xxHash-v0.8.0_GH0.tar.gz) = 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f
 SIZE (Cyan4973-xxHash-v0.8.0_GH0.tar.gz) = 145909
 SHA256 (FNA-XNA-FAudio-21.04_GH0.tar.gz) = 220fe329d2dcf1c4fa929de0a7532ee7f98facf3184ce9d21a21fad1f510bc03
 SIZE (FNA-XNA-FAudio-21.04_GH0.tar.gz) = 1138944
 SHA256 (asmjit-asmjit-723f585_GH0.tar.gz) = 1e20547cc3e10c69d16f50dd0b21ac58660dcb8fa455e39d90883305d6247686
 SIZE (asmjit-asmjit-723f585_GH0.tar.gz) = 446823
 SHA256 (google-flatbuffers-v1.11.0_GH0.tar.gz) = 3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b
 SIZE (google-flatbuffers-v1.11.0_GH0.tar.gz) = 894944
 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.3-30-g6a211f0_GH0.tar.gz) = 4b832de2a1d0934ecc58c9c920e17908e52305f9d99d7d24625d3f13e974e0cc
 SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.3-30-g6a211f0_GH0.tar.gz) = 1398571
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd
 SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836
 SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2
 SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982
 SHA256 (KhronosGroup-glslang-11.4.0_GH0.tar.gz) = 9bae79c2b640b60474f8944a5ab4aff3af990074636ea2a0a3c97cb86be61dfa
 SIZE (KhronosGroup-glslang-11.4.0_GH0.tar.gz) = 3342311
 SHA256 (wolfSSL-wolfssl-v4.5.0-stable-80-g39b544860_GH0.tar.gz) = ae8198711705b989268fc46be5a614f8fede4dcaff39cacb1cc1e4e20f9e7d32
 SIZE (wolfSSL-wolfssl-v4.5.0-stable-80-g39b544860_GH0.tar.gz) = 7481334
 SHA256 (zeux-pugixml-v1.11.4_GH0.tar.gz) = 017139251c122dbff400a507cddc4cb74120a431a50c6c524f30edcc5b331ade
 SIZE (zeux-pugixml-v1.11.4_GH0.tar.gz) = 566750