diff --git a/cheroot-7.0.0.tar.gz b/cheroot-7.0.0.tar.gz
deleted file mode 100644
index 8ed2237..0000000
--- a/cheroot-7.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6168371ab9aaf574ac5f75675f244bbfebf990202bf75048065e9d675b9ae719
-size 87669
diff --git a/cheroot-8.2.1.tar.gz b/cheroot-8.2.1.tar.gz
new file mode 100644
index 0000000..74271e8
--- /dev/null
+++ b/cheroot-8.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b525b3e4a755adf78070ab54c1821fb860d4255a9317dba2b88eb2df2441cff
+size 89470
diff --git a/python-cheroot.changes b/python-cheroot.changes
index b8739d9..947a1cb 100644
--- a/python-cheroot.changes
+++ b/python-cheroot.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct 23 13:38:06 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
+
+- Update to 8.2.1
+  * Deprecated use of negative timeouts as alias for infinite timeouts in ThreadPool.stop.
+  * For OPTION requests, bypass URI as path if it does not appear absolute.
+  * Workers are now request-based, addressing the long-standing issue with keep-alive connections
+  * Remove custom setup.cfg parser handling, allowing the project (including sdist) 
+    to build/run on setuptools 41.4. Now building cheroot requires setuptools 30.3 or later 
+    (for declarative config support) and preferably 34.4 or later (as indicated in pyproject.toml).
+
 -------------------------------------------------------------------
 Fri Oct  4 11:09:50 UTC 2019 - Marketa Calabkova <mcalabkova@suse.com>
 
diff --git a/python-cheroot.spec b/python-cheroot.spec
index c816f70..ddb1faf 100644
--- a/python-cheroot.spec
+++ b/python-cheroot.spec
@@ -19,7 +19,7 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define pypi_name cheroot
 Name:           python-%{pypi_name}
-Version:        7.0.0
+Version:        8.2.1
 Release:        0
 Summary:        Pure-python HTTP server
 License:        BSD-3-Clause
@@ -32,9 +32,9 @@ BuildRequires:  %{python_module pytest >= 2.8}
 BuildRequires:  %{python_module pytest-mock >= 1.10.4}
 BuildRequires:  %{python_module requests-unixsocket}
 BuildRequires:  %{python_module requests}
+BuildRequires:  %{python_module setuptools >= 34.4}
 BuildRequires:  %{python_module setuptools_scm >= 1.15.0}
 BuildRequires:  %{python_module setuptools_scm_git_archive >= 1.0}
-BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module six >= 1.11.0}
 BuildRequires:  %{python_module trustme}
 BuildRequires:  fdupes
@@ -63,10 +63,6 @@ Cheroot is the pure-Python HTTP server used by CherryPy.
 %autosetup -n cheroot-%{version} -p1
 # do not require cov/xdist/etc
 sed -i -e '/addopts/d' pytest.ini
-for file in "%{pypi_name}.egg-info/requires.txt" "setup.cfg"; do
-    sed -i "s/backports.functools_lru_cache$/backports.functools_lru_cache ; python_version < '3.3'/" \
-        "${file}"
-done
 
 %build
 %python_build