diff --git a/petsc-3.19.4-fix_Cython_requirement.patch b/petsc-3.19.4-fix_Cython_requirement.patch
index fd07eab..e119c65 100644
--- a/petsc-3.19.4-fix_Cython_requirement.patch
+++ b/petsc-3.19.4-fix_Cython_requirement.patch
@@ -14,7 +14,7 @@
      finally:
          os.chdir(cwd)
 -    require = 'Cython == %s' % VERSION
-+    require = 'Cython >= 0.29.36'
++    require = 'Cython == 0.29.36'
      if setuptools and not cython_chk(VERSION, verbose=False):
          if sys.modules.get('Cython'):
              removed = getattr(sys.modules['Cython'], '__version__', '')
diff --git a/petsc.spec b/petsc.spec
index 9dfc487..c8651e7 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -460,10 +460,8 @@ BuildRequires:  hdf5-openmpi-devel
 BuildRequires:  scalapack-openmpi-devel
 BuildRequires:  ptscotch-openmpi-devel
 BuildRequires:  python3-numpy
-%if 0%{?rhel} || 0%{?fedora} < 39
+%if 0%{?fedora} <= 37
 BuildRequires:  python3-Cython
-%else
-BuildRequires:  python3-pip
 %endif
 Requires:       petsc-openmpi%{?_isa}
 Requires:       hdf5-openmpi%{?_isa}
@@ -493,7 +491,6 @@ BuildRequires:  hdf5-mpich-devel
 BuildRequires:  scalapack-mpich-devel
 BuildRequires:  ptscotch-mpich-devel
 BuildRequires:  python3-numpy
-BuildRequires:  python3-Cython
 Requires:       petsc-mpich%{?_isa}
 Requires:       hdf5-mpich%{?_isa}
 Requires:       scalapack-openmpi%{?_isa}
@@ -575,16 +572,20 @@ Portable Extensible Toolkit for Scientific Computation (developer files).
 %setup -q -T -D -a 1
 cp -a petsc4py-%{version}/* %{name}-%{version}/
 rm -rf %{name}-%{version}/*.egg-info
+rm -rf %{name}-%{version}/src/binding/petsc4py/src/petsc4py.egg-info
 rm -rf petsc4py-%{version}
 
 # Use pre-generated Cython files
 %if 0%{?fedora} > 38
 rm -f %{name}-%{version}/src/binding/petsc4py/src/PETSc.c
 install -pm 644 %{SOURCE2} %{name}-%{version}/src/binding/petsc4py/src/PETSc.c
+install -pm 644 %{SOURCE2} %{name}-%{version}/src/binding/petsc4py/src/petsc4py/PETSc.c
 rm -f %{name}-%{version}/src/binding/petsc4py/src/PETSc.h
 install -pm 644 %{SOURCE3} %{name}-%{version}/src/binding/petsc4py/src/PETSc.h
+install -pm 644 %{SOURCE3} %{name}-%{version}/src/binding/petsc4py/src/petsc4py/PETSc.h
 rm -f %{name}-%{version}/src/binding/petsc4py/src/PETSc_api.h
 install -pm 644 %{SOURCE4} %{name}-%{version}/src/binding/petsc4py/src/PETSc_api.h
+install -pm 644 %{SOURCE4} %{name}-%{version}/src/binding/petsc4py/src/petsc4py/PETSc_api.h
 pushd %{name}-%{version}
 %patch -P 9 -p1 -b .backup
 popd