diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 37ba06433e07..82568eeb07d2 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.16-12351 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-ga7d4da25a
+DISTVERSION=	0.0.16-12361 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-g6c44664c1
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -29,8 +29,8 @@ GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-28-g8961cf8:hidapi/3rdparty/hidapi/hidap
 		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/Vulkan/spirv-headers \
-		KhronosGroup:SPIRV-Tools:v2020.4:spirv_tools/Vulkan/spirv-tools \
+		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 \
 		USCiLab:cereal:v1.3.0-5-g60c69df9:cereal/3rdparty/cereal \
 		wolfSSL:wolfssl:v4.5.0-stable-80-g39b544860:wolfssl/3rdparty/wolfssl \
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index ca65b7488c01..26a5e9fdf85d 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1622491273
+TIMESTAMP = 1622612030
 SHA256 (libcxx-12.0.0.src.tar.xz) = 7dcb75ca4f6aae2c677d128460c48a57398c8b6791b77b74bea7cf9e04e7c3f1
 SIZE (libcxx-12.0.0.src.tar.xz) = 1880864
-SHA256 (RPCS3-rpcs3-v0.0.16-12351-ga7d4da25a_GH0.tar.gz) = 0543d05cb672967d5cbca78f557a4ad7a507586dad5f103789654890a1993276
-SIZE (RPCS3-rpcs3-v0.0.16-12351-ga7d4da25a_GH0.tar.gz) = 8060747
+SHA256 (RPCS3-rpcs3-v0.0.16-12361-g6c44664c1_GH0.tar.gz) = 0dbe6c5234fef102eb5d2a0f4e109ff7be3a7e6adfe90d82b4e199281f98e0b8
+SIZE (RPCS3-rpcs3-v0.0.16-12361-g6c44664c1_GH0.tar.gz) = 8062835
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-28-g8961cf8_GH0.tar.gz) = 0f0f3b3af2fff7004f479a1adbbb81658b62a2e07b5978acc65833273e8124d7
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-28-g8961cf8_GH0.tar.gz) = 105391
 SHA256 (RPCS3-llvm-mirror-5836324d6443_GH0.tar.gz) = b996a126f5d1beb558d63fb79005cf193c591cf8787dd86bcdb1f289f817e964