diff --git a/Assets/dll/libcitra-headless.so b/Assets/dll/libcitra-headless.so
old mode 100644
new mode 100755
index e80fda39cb..bd95f341aa
Binary files a/Assets/dll/libcitra-headless.so and b/Assets/dll/libcitra-headless.so differ
diff --git a/citra/build_release.sh b/citra/build_release.sh
index 47f3d7613f..cd200120de 100755
--- a/citra/build_release.sh
+++ b/citra/build_release.sh
@@ -3,7 +3,10 @@ set -e
 if [ -z "$CC" ]; then export CC="clang"; fi
 if [ -z "$CXX" ]; then export CXX="clang++"; fi
 
-# libc++ must be used currently as Citra fails to build with stdlibc++ due to a stdlibc++ bug
+# stdlibc++ has a bug in some versions (at least in Ubuntu 22.04, probably Debian 12 too) that will cause compilation to fail for Citra
+# Debian 11's stdlibc++ is unaffected (and probably Ubuntu 20.04's too)
+# Note that Debian 10's stdlibc++ is too old (nearly no c++20 support), so at least Debian 11 must be used to compile this core
+# At least cmake 3.20 must be present too, so get cmake from bullseye-backports
 
 rm -rf build
 mkdir build
@@ -14,5 +17,5 @@ cmake ../citra -DENABLE_SDL2=OFF -DUSE_SYSTEM_SDL2=OFF -DENABLE_QT=OFF -DENABLE_
  -DENABLE_LIBUSB=OFF -DUSE_DISCORD_PRESENCE=OFF -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_OPENSSL=OFF -DUSE_SYSTEM_LIBUSB=OFF \
  -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF -DENABLE_HEADLESS=ON -DCMAKE_PROGRAM_PATH=$GLSLANG_VALIDATOR_DIR \
  -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=ON -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Wno-deprecated" -G Ninja
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS="-Wno-deprecated -include limits.h" -G Ninja
 ninja
diff --git a/citra/citra b/citra/citra
index 7274628585..e9cdb88d90 160000
--- a/citra/citra
+++ b/citra/citra
@@ -1 +1 @@
-Subproject commit 72746285852b0a1f2a20d1d743b0a5da299b93aa
+Subproject commit e9cdb88d90966cbeb8536a28c91a211d6ab5e541