diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec
index 09be465..98b0a29 100644
--- a/ibus-typing-booster.spec
+++ b/ibus-typing-booster.spec
@@ -10,8 +10,8 @@ Requires:   m17n-lib
 %{?__python3:Requires: %{__python3}}
 Requires:   python3-dbus
 Requires:   python3-distro
-# Require python3-setuptools because of “from packing import version”:
-Requires:   python3-setuptools
+# because of “from packing import version”:
+Requires:   python3-packaging
 Requires:   python3-enchant
 Requires:   python3-pyxdg
 %if 0%{?fedora} >= 24 || 0%{?rhel} > 7
@@ -44,10 +44,12 @@ BuildRequires:  python34-devel
 BuildRequires:  m17n-lib
 BuildRequires:  m17n-db-extras
 BuildRequires:  python3-enchant
-# Require python3-setuptools because of “from packing import version”:
-BuildRequires:   python3-setuptools
+# because of “from packing import version”:
+BuildRequires:   python3-packaging
+%if 0%{?fedora} >= 35
 # to make the python3-enchant test work for hunspell dictionaries which are not yet UTF-8:
 BuildRequires:   glibc-gconv-extra
+%endif
 %if 0%{?fedora} && 0%{?fedora} >= 34
 BuildRequires:  python3-libvoikko
 BuildRequires:  voikko-fi