diff --git a/python3.9.spec b/python3.9.spec
index 44e8502..f4488ac 100644
--- a/python3.9.spec
+++ b/python3.9.spec
@@ -177,6 +177,7 @@ BuildRequires: gcc-c++
 %if %{with gdbm}
 BuildRequires: gdbm-devel
 %endif
+BuildRequires: git-core
 BuildRequires: glibc-all-langpacks
 BuildRequires: glibc-devel
 BuildRequires: gmp-devel
@@ -620,7 +621,19 @@ version once Python %{pybasever} is stable.
 
 %prep
 %gpgverify -k2 -s1 -d0
-%setup -q -n Python-%{upstream_version}
+%autosetup -S git_am -N -n Python-%{upstream_version}
+
+# Apply patches up to 188
+%autopatch -M 188
+
+%if %{with rpmwheels}
+%apply_patch -q %{PATCH189}
+rm Lib/ensurepip/_bundled/*.whl
+%endif
+
+# Apply the remaining patches
+%autopatch -m 190
+
 # Remove all exe files to ensure we are not shipping prebuilt binaries
 # note that those are only used to create Microsoft Windows installers
 # and that functionality is broken on Linux anyway
@@ -629,20 +642,6 @@ find -name '*.exe' -print -delete
 # Remove bundled libraries to ensure that we're using the system copy.
 rm -r Modules/expat
 
-#
-# Apply patches:
-#
-%patch1 -p1
-%patch111 -p1
-
-%if %{with rpmwheels}
-%patch189 -p1
-rm Lib/ensurepip/_bundled/*.whl
-%endif
-
-%patch251 -p1
-%patch274 -p1
-%patch328 -p1
 
 
 # Remove files that should be generated by the build