diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index 9de126df1a..912d83d8e7 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -213,11 +213,14 @@
     },
     "sdl2_ps4": {
         "package": "SDL2",
-        "repo": "xinitrcn1/SDL",
-        "sha": "f577141fc4",
+        "repo": "libsdl-org/SDL",
+        "sha": "0c7042477a",
         "key": "ps4",
         "bundled": true,
-        "skip_updates": true
+        "skip_updates": true,
+        "patches": [
+            "0001-ps4.patch"
+        ]
     },
     "moltenvk": {
         "repo": "V380-Ori/Ryujinx.MoltenVK",
diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp
index 69eca732eb..0c9bd4fb4d 100644
--- a/src/common/fiber.cpp
+++ b/src/common/fiber.cpp
@@ -16,7 +16,7 @@
 namespace Common {
 
 #ifdef __OPENORBIS__
-constexpr size_t DEFAULT_STACK_SIZE = 128 * 4096;
+constexpr size_t DEFAULT_STACK_SIZE = 256 * 4096;
 #else
 constexpr size_t DEFAULT_STACK_SIZE = 512 * 4096;
 #endif
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
index 4438459c9c..7d69060d57 100644
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -75,8 +75,7 @@ if (ENABLE_SDL2)
         helpers/joycon_protocol/rumble.cpp
         helpers/joycon_protocol/rumble.h
     )
-    target_include_directories(input_common PRIVATE ${CMAKE_SYSROOT}/include/SDL2)
-    target_link_libraries(input_common PRIVATE SDL2)
+    target_link_libraries(input_common PRIVATE SDL2::SDL2)
     target_compile_definitions(input_common PRIVATE HAVE_SDL2)
 endif()
 
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index a6ebc07601..27911d2ac8 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -430,8 +430,7 @@ if (WIN32 AND NOT YUZU_USE_BUNDLED_QT AND QT_VERSION VERSION_GREATER_EQUAL 6)
 endif()
 
 if (ENABLE_SDL2)
-    target_include_directories(yuzu PRIVATE ${CMAKE_SYSROOT}/include/SDL2)
-    target_link_libraries(yuzu PRIVATE SDL2)
+    target_link_libraries(yuzu PRIVATE SDL2::SDL2)
     target_compile_definitions(yuzu PRIVATE HAVE_SDL2)
 endif()
 
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index c153e9fb78..3b85bc1d28 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -39,9 +39,7 @@ target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 
 create_resource("../../dist/eden.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
 target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})
-
-target_include_directories(yuzu-cmd PRIVATE ${CMAKE_SYSROOT}/include/SDL2)
-target_link_libraries(yuzu-cmd PRIVATE SDL2)
+target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2)
 
 if(UNIX AND NOT APPLE)
     install(TARGETS yuzu-cmd)