diff --git a/python-rpm-generators.spec b/python-rpm-generators.spec
index 1fe1fdc..f17486b 100644
--- a/python-rpm-generators.spec
+++ b/python-rpm-generators.spec
@@ -4,8 +4,8 @@
 
 Name:           python-rpm-generators
 Summary:        Dependency generators for Python RPMs
-Version:        7
-Release:        2%{?dist}
+Version:        8
+Release:        1%{?dist}
 
 # Originally all those files were part of RPM, so license is kept here
 License:        GPLv2+
@@ -49,6 +49,10 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py
 %{_rpmconfigdir}/pythondistdeps.py
 
 %changelog
+* Wed Apr 17 2019 Miro Hrončok <mhroncok@redhat.com> - 8-1
+- console_scripts entry points to require setuptools
+  https://github.com/rpm-software-management/rpm/pull/666
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/pythondistdeps.py b/pythondistdeps.py
index 2f3dd71..d81cd4b 100755
--- a/pythondistdeps.py
+++ b/pythondistdeps.py
@@ -102,7 +102,7 @@ for f in files:
             lower.endswith('.egg-info') or \
             lower.endswith('.dist-info'):
         # This import is very slow, so only do it if needed
-        from pkg_resources import Distribution, FileMetadata, PathMetadata
+        from pkg_resources import Distribution, FileMetadata, PathMetadata, Requirement
         dist_name = basename(f)
         if isdir(f):
             path_item = dirname(f)
@@ -127,6 +127,7 @@ for f in files:
         import platform
         platform.python_version = lambda: dist.py_version
 
+
         if Provides_PyMajorVer_Variant or PyMajorVer_Deps or legacy_Provides or legacy:
             # Get the Python major version
             pyver_major = dist.py_version.split('.')[0]
@@ -179,6 +180,11 @@ for f in files:
                         if dep in deps:
                             depsextras.remove(dep)
                 deps = depsextras
+            # console_scripts/gui_scripts entry points need pkg_resources from setuptools
+            if (dist.get_entry_map('console_scripts') or
+                    dist.get_entry_map('gui_scripts')):
+                # stick them first so any more specific requirement overrides it
+                deps.insert(0, Requirement.parse('setuptools'))
             # add requires/recommends based on egg/dist metadata
             for dep in deps:
                 if legacy: