diff --git a/pypy3.10.spec b/pypy3.10.spec
index 24dbe1c..a2c2f72 100644
--- a/pypy3.10.spec
+++ b/pypy3.10.spec
@@ -10,7 +10,7 @@ Version:        %{basever}.%{micro}%{?pre:~%{pre}}
 # by Python version as well.
 # This potentially allows tags like Obsoletes: pypy3 < %%{version}-%%{release}.
 # https://bugzilla.redhat.com/2053880
-%global baserelease 1
+%global baserelease 2
 Release:        %{baserelease}.%{pyversion}%{?dist}
 Summary:        Python %{pyversion} implementation with a Just-In-Time compiler
 
@@ -68,13 +68,17 @@ ExcludeArch:    %{ix86}
 # We refer to this subdir of the source tree in a few places during the build:
 %global goal_dir pypy/goal
 
+%if 0%{?fedora} >= 39
 # REMINDER: When updating the main pypy3 version for a certain Fedora release
 # make sure to update the python-classroom group in https://pagure.io/fedora-comps/
 #   1. locate comps-fXX.xml.in for each affected Fedora release
 #   2. inside the <id>python-classroom</id> group locate <packagereq ...>pypy3.N-devel</packagereq>
 #   3. change the package name to match the new version
 #   4. submit changes as a pull request and make sure somebody merges it
+%bcond_without main_pypy3
+%else
 %bcond_with main_pypy3
+%endif
 
 %ifarch %{ix86} x86_64 %{arm}
 %global _package_note_linker gold
@@ -827,6 +831,9 @@ CheckPyPy pypy%{pyversion}-c
 
 
 %changelog
+* Tue Aug 22 2023 Miro Hrončok <mhroncok@redhat.com> - 7.3.12-2.3.10
+- Make PyPy 3.10 the main PyPy 3 on Fedora 39+
+
 * Wed Jul 26 2023 Miro Hrončok <mhroncok@redhat.com> - 7.3.12-1.3.10
 - Initial PyPy 3.10 package