diff --git a/SPECS/custodia.spec b/SPECS/custodia.spec
index 2ff9ba6..7421846 100644
--- a/SPECS/custodia.spec
+++ b/SPECS/custodia.spec
@@ -1,6 +1,6 @@
 Name:           custodia
 Version:        0.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A service to manage, retrieve and store secrets for other processes
 
 License:        GPLv3+
@@ -55,8 +55,12 @@ Summary:    Sub-package with python3 custodia modules
 %{?python_provide:%python_provide python3-%{name}}
 Requires:   python%{python3_pkgversion}-jwcrypto >= 0.4.2
 Requires:   python%{python3_pkgversion}-requests
-Requires:   python%{python3_pkgversion}-setuptools
 Requires:   python%{python3_pkgversion}-systemd
+%if 0%{?rhel} && 0%{?rhel} >= 8
+Requires:   platform-python-setuptools
+%else
+Requires:   python%{python3_pkgversion}-setuptools
+%endif
 Conflicts:  python%{python3_pkgversion}-custodia-extra < %{version}
 Obsoletes:  python%{python3_pkgversion}-custodia-extra < %{version}
 
@@ -164,6 +168,10 @@ exit 0
 
 
 %changelog
+* Fri Nov 16 2018 Lumír Balhar <lbalhar@redhat.com> - 0.6.0-3
+- Require platform-python-setuptools instead of python3-setuptools
+- Resolves: rhbz#1650508
+
 * Fri Jun 29 2018 Christian Heimes <cheimes@redhat.com> - 0.6.0-2
 - Don't turn deprecation warnings into fatal errors