diff --git a/pkgs/by-name/re/renpy/package.nix b/pkgs/by-name/re/renpy/package.nix
index a5c0aa7ea091..6b74d180768f 100644
--- a/pkgs/by-name/re/renpy/package.nix
+++ b/pkgs/by-name/re/renpy/package.nix
@@ -12,7 +12,7 @@
   makeWrapper,
   nix-update-script,
   pkg-config,
-  python311,
+  python3Full,
   SDL2,
   stdenv,
   versionCheckHook,
@@ -21,25 +21,23 @@
 }:
 
 let
-  python = python311;
+  python = python3Full;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "renpy";
-  version = "8.3.4.24120703";
+  version = "8.3.6.25022803";
 
   src = fetchFromGitHub {
     owner = "renpy";
     repo = "renpy";
     tag = finalAttrs.version;
-    hash = "sha256-9f1ptw+6OQ2rMytwPZPtUd+K/ihnVKHUiELs22iTTqE=";
+    hash = "sha256-ibWbYf+e8PZ8ZxLHVPLzHBS0qf+eLzJasJJFHxXlCfk=";
   };
 
   nativeBuildInputs = [
     makeWrapper
     pkg-config
-    # Ren'Py currently does not compile on Cython 3.x.
-    # See https://github.com/renpy/renpy/issues/5359
-    python.pkgs.cython_0
+    python.pkgs.cython
     python.pkgs.setuptools
   ];
 
@@ -120,7 +118,9 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  env.NIX_CFLAGS_COMPILE = "-I${python.pkgs.pygame-sdl2}/include/${python.libPrefix}";
+  env = {
+    NIX_CFLAGS_COMPILE = "-I${python.pkgs.pygame-sdl2}/include";
+  };
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/development/python-modules/pygame-sdl2/default.nix b/pkgs/development/python-modules/pygame-sdl2/default.nix
index e8bea65a499f..fb558f881fba 100644
--- a/pkgs/development/python-modules/pygame-sdl2/default.nix
+++ b/pkgs/development/python-modules/pygame-sdl2/default.nix
@@ -1,6 +1,6 @@
 {
   buildPythonPackage,
-  cython_0,
+  cython,
   fetchFromGitHub,
   lib,
   libjpeg,
@@ -15,18 +15,18 @@
 
 buildPythonPackage rec {
   pname = "pygame-sdl2";
-  version = "8.3.1.24090601";
+  version = "8.3.5.25022704";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "renpy";
     repo = "pygame_sdl2";
     tag = "renpy-${version}";
-    hash = "sha256-0itOmDScM+4HmWTpjkln56pv+yXDPB1KIDbE6ub2Tls=";
+    hash = "sha256-MA6c29UbZIBCIxUDfSiqxgdhrd9Ys5Yf/zKeXvI1iJ0=";
   };
 
   build-system = [
-    cython_0
+    cython
     SDL2
     setuptools
   ];
@@ -42,11 +42,20 @@ buildPythonPackage rec {
 
   doCheck = true;
 
-  preBuild = ''
-    substituteInPlace setup.py --replace-fail "2.1.0" "${version}"
-    substituteInPlace src/pygame_sdl2/version.py --replace-fail "2, 1, 0" "${
+  postUnpack = ''
+    substituteInPlace source/setup.py --replace-fail "2.1.0" "${version}"
+    substituteInPlace source/src/pygame_sdl2/version.py --replace-fail "2, 1, 0" "${
       builtins.replaceStrings [ "." ] [ ", " ] version
     }"
+
+    headers=$(mktemp -d)
+    substituteInPlace source/setup.py --replace-fail \
+      "pathlib.Path(sysconfig.get_paths()['include']) / \"pygame_sdl2\"" \
+      "pathlib.Path(\"$headers\")"
+  '';
+
+  postInstall = ''
+    install -Dm644 $headers/* -t $out/include/pygame_sdl2
   '';
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=renpy-(.*)" ]; };