diff --git a/0001-Update-cherrypy-and-cheroot-requirement-pinning.patch b/0001-Update-cherrypy-and-cheroot-requirement-pinning.patch
new file mode 100644
index 0000000..0b58089
--- /dev/null
+++ b/0001-Update-cherrypy-and-cheroot-requirement-pinning.patch
@@ -0,0 +1,36 @@
+From e8935676a8b6db3b29d419d440f9e82b5090a5b2 Mon Sep 17 00:00:00 2001
+From: Fabien Boucher <fboucher@redhat.com>
+Date: Mon, 13 Jul 2020 15:32:53 +0000
+Subject: [PATCH] Update cherrypy and cheroot requirement pinning
+
+Cheroot 8.3.1 have been released with the https://github.com/cherrypy/cheroot/issues/263
+fix.
+
+Change-Id: I83aad30a6145ed2c7689d6c25c624c453c07ed2b
+---
+ requirements.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 78eb980f..829c7606 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -29,13 +29,10 @@ iso8601
+ psutil
+ fb-re2>=1.0.6
+ paho-mqtt
+-cherrypy==18.3.0; # last version to support cheroot below
++cherrypy
+ ws4py
+ routes
+ pathspec
+ jsonpath-rw
+ urllib3!=1.25.4,!=1.25.5  # https://github.com/urllib3/urllib3/pull/1684
+-# TODO(tobiash): cheroot 8.1.0 introduced a regression when handling concurrent
+-# requests. Remove the following line when this issue is resolved:
+-# https://github.com/cherrypy/cheroot/issues/263
+-cheroot<8.1.0
++cheroot!=8.1.*,!=8.2.*,!=8.3.0 # https://github.com/cherrypy/cheroot/issues/263
+-- 
+2.27.0
+
diff --git a/zuul.spec b/zuul.spec
index 091e4a0..3ae27d0 100644
--- a/zuul.spec
+++ b/zuul.spec
@@ -1,5 +1,3 @@
-%{?python_disable_dependency_generator}
-
 Name:           zuul
 Version:        3.19.0
 Release:        1%{?dist}
@@ -22,20 +20,10 @@ Source10:       main.yaml
 Patch01:        0001-Remove-another-shebang-and-remove-useless-exec-bits.patch
 Patch02:        0001-requirements-add-explicit-reference-to-dateutil.patch
 Patch03:        0001-Replace-deprecated-Thread.isAlive-with-Thread.is_ali.patch
+Patch04:        0001-Update-cherrypy-and-cheroot-requirement-pinning.patch
 
 BuildArch:      noarch
 
-
-#Error:
-# Problem: conflicting requests
-# https://github.com/cherrypy/cheroot/issues/263 # the zuul cap reason
-# The proposed fix https://github.com/cherrypy/cheroot/pull/277
-# https://bugzilla.redhat.com/show_bug.cgi?id=1834207
-#  - nothing provides python3.8dist(cheroot) < 8.1 needed by zuul-3.19.0-1.fc33.noarch
-#  - nothing provides python3.8dist(cherrypy) = 18.3 needed by zuul-3.19.0-1.fc33.noarch
-# TODO: https://bugzilla.redhat.com/show_bug.cgi?id=1849654
-
-
 BuildRequires:  python3-devel
 BuildRequires:  python3-pbr
 BuildRequires:  python3-setuptools
@@ -83,58 +71,6 @@ BuildRequires:  python3-graphene
 BuildRequires:  systemd
 BuildRequires:  ansible
 
-#rpm -qpR results_zuul/3.19.0/1.fc33/zuul-3.19.0-1.fc33.noarch.rpm 
-Requires:       ((python3.9dist(gear) < 0.15 or python3.9dist(gear) > 0.15) with python3.9dist(gear) < 1 with python3.9dist(gear) >= 0.13)
-Requires:       ((python3.9dist(urllib3) < 1.25.4 or python3.9dist(urllib3) > 1.25.4) with (python3.9dist(urllib3) < 1.25.5 or python3.9dist(urllib3) > 1.25.5))
-Requires:       ((python3.9dist(virtualenv) < 20 or python3.9dist(virtualenv) > 20) with (python3.9dist(virtualenv) < 20.0.1 or python3.9dist(virtualenv) > 20.0.1) with python3.9dist(virtualenv) > 20)
-Requires:       (python3.9dist(prettytable) < 0.8 with python3.9dist(prettytable) >= 0.6)
-Requires:       /bin/sh
-Requires:       /usr/bin/python3
-Requires:       config(zuul) = 3.19.0-1.fc33
-Requires:       python(abi) = 3.9
-Requires:       python3-cheroot
-Requires:       python3.9dist(alembic)
-Requires:       python3.9dist(apscheduler) >= 3
-Requires:       python3.9dist(babel) >= 1
-Requires:       python3.9dist(cachecontrol)
-Requires:       python3.9dist(cachetools)
-
-#Requires:       python3.9dist(cheroot) < 8.1
-#Requires:       python3.9dist(cherrypy) = 18.3
-Requires:       python3.9dist(cheroot)
-Requires:       python3.9dist(cherrypy)
-
-Requires:       python3.9dist(cryptography) >= 1.6
-Requires:       python3.9dist(extras)
-Requires:       python3.9dist(fb-re2) >= 1.0.6
-Requires:       python3.9dist(github3-py) >= 1.1
-Requires:       python3.9dist(gitpython) >= 2.1.8
-Requires:       python3.9dist(iso8601)
-Requires:       python3.9dist(jsonpath-rw)
-Requires:       python3.9dist(kazoo)
-Requires:       python3.9dist(netaddr)
-Requires:       python3.9dist(paho-mqtt)
-Requires:       python3.9dist(paramiko) >= 2.0.1
-Requires:       python3.9dist(pathspec)
-Requires:       python3.9dist(pbr) >= 1.1
-Requires:       python3.9dist(psutil)
-Requires:       python3.9dist(pyjwt)
-Requires:       python3.9dist(python-daemon) >= 2.0.4
-Requires:       python3.9dist(python-dateutil)
-Requires:       python3.9dist(pyyaml) >= 3.1
-Requires:       python3.9dist(routes)
-Requires:       python3.9dist(setuptools)
-Requires:       python3.9dist(sqlalchemy)
-Requires:       python3.9dist(statsd) >= 3
-Requires:       python3.9dist(voluptuous) >= 0.10.2
-Requires:       python3.9dist(ws4py)
-Requires:       rpmlib(CompressedFileNames) <= 3.0.4-1
-Requires:       rpmlib(FileDigests) <= 4.6.0-1
-Requires:       rpmlib(PartialHardlinkSets) <= 4.0.4-1
-Requires:       rpmlib(PayloadFilesHavePrefix) <= 4.0-1
-Requires:       rpmlib(PayloadIsZstd) <= 5.4.18-1
-Requires:       rpmlib(RichDependencies) <= 4.12.0-1
-
 %description
 Zuul is a program that drives continuous integration, delivery,
 and deployment systems with a focus on project gating and