diff --git a/netcdf4-python.spec b/netcdf4-python.spec
index 635ba25..76bca54 100644
--- a/netcdf4-python.spec
+++ b/netcdf4-python.spec
@@ -1,6 +1,6 @@
 Name:           netcdf4-python
 Version:        1.5.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python/numpy interface to netCDF
 
 License:        MIT
@@ -140,9 +140,9 @@ PYTHONPATH=$(echo ../build/lib.*%{python2_version}) %{__python2} run_all.py
 %endif
 %ifarch s390x
 # FAIL: runTest (tst_compoundvar.VariablesTestCase) -> assert (cmptype4 == dtype4a) # data type should be aligned
-PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py || :
+PYTHONPATH=$(echo ../build/lib.linux-*) %{__python3} run_all.py || :
 %else
-PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
+PYTHONPATH=$(echo ../build/lib.linux-*) %{__python3} run_all.py
 %endif
 
 
@@ -166,6 +166,10 @@ PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
 
 
 %changelog
+* Mon Jun 20 2022 Charalampos Stratakis <cstratak@redhat.com> - 1.5.8-3
+- Fix FTBFS with the latest setuptools
+Resolves: rhbz#2097125
+
 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.5.8-2
 - Rebuilt for Python 3.11