diff --git a/CherryPy-18.3.0.tar.gz b/CherryPy-18.3.0.tar.gz
deleted file mode 100644
index a86c5a0..0000000
--- a/CherryPy-18.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:683e687e7c7b1ba31ef86a113b1eafd0407269fed175bf488d3c839d37d1cc60
-size 685192
diff --git a/CherryPy-18.5.0.tar.gz b/CherryPy-18.5.0.tar.gz
new file mode 100644
index 0000000..fa84936
--- /dev/null
+++ b/CherryPy-18.5.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63b2f61c38c469112145bd4e4e2385cd18f3233799e7a33bd447df468916d22b
+size 685362
diff --git a/python-CherryPy.changes b/python-CherryPy.changes
index e180835..1e1615b 100644
--- a/python-CherryPy.changes
+++ b/python-CherryPy.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 13 15:00:55 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
+
+- update to 18.5.0
+  * Fixed issue where bytes values in a HeaderMap would be converted to strings.
+  * Rely on jaraco.collections for its case-insensitive dictionary support.
+  * Fixed issue in cpstats where the data/ endpoint would fail with encoding errors on Python 3.
+  * Simplify the passthrough of parameters to CPWebCase.getPage to cheroot. 
+    CherryPy now requires cheroot 8.2.1 or later.
+
 -------------------------------------------------------------------
 Wed Oct 30 13:15:39 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-CherryPy.spec b/python-CherryPy.spec
index b1d4ec7..84e419d 100644
--- a/python-CherryPy.spec
+++ b/python-CherryPy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-CherryPy
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-CherryPy
-Version:        18.3.0
+Version:        18.5.0
 Release:        0
 Summary:        Object-Oriented HTTP framework
 License:        BSD-3-Clause
@@ -29,7 +29,8 @@ BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-cheroot >= 6.2.4
+Requires:       python-cheroot >= 8.2.1
+Requires:       python-jaraco.collections
 Requires:       python-more-itertools
 Requires:       python-portend >= 2.1.1
 Requires:       python-zc.lockfile
@@ -42,7 +43,8 @@ Recommends:     python-pyOpenSSL
 Recommends:     python-simplejson
 BuildArch:      noarch
 # SECTION test requirements
-BuildRequires:  %{python_module cheroot >= 6.2.4}
+BuildRequires:  %{python_module cheroot >= 8.2.1}
+BuildRequires:  %{python_module jaraco.collections}
 BuildRequires:  %{python_module more-itertools}
 BuildRequires:  %{python_module path.py}
 BuildRequires:  %{python_module portend >= 2.1.1}
@@ -76,14 +78,11 @@ sed -i -e '/addopts/d' pytest.ini
 
 %install
 %python_install
-# Do not remove the tests as other project use them for self validation
-#%%python_expand rm -r %{buildroot}%{$python_sitelib}/cherrypy/test
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %python_clone -a %{buildroot}%{_bindir}/cherryd
 
 %check
-# test_HTTP11_Timeout_after_request https://github.com/cherrypy/cherrypy/issues/1817
-%pytest -k 'not test_null_bytes and not test_HTTP11_Timeout_after_request'
+%pytest
 
 %post
 %python_install_alternative cherryd