diff --git a/CherryPy-18.2.0.tar.gz b/CherryPy-18.2.0.tar.gz
deleted file mode 100644
index 7e3c089..0000000
--- a/CherryPy-18.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:16fc226a280cd772ede7c309d3964002196784ac6615d8bface52be12ff51230
-size 684947
diff --git a/CherryPy-18.3.0.tar.gz b/CherryPy-18.3.0.tar.gz
new file mode 100644
index 0000000..a86c5a0
--- /dev/null
+++ b/CherryPy-18.3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:683e687e7c7b1ba31ef86a113b1eafd0407269fed175bf488d3c839d37d1cc60
+size 685192
diff --git a/python-CherryPy.changes b/python-CherryPy.changes
index c50e2b6..e180835 100644
--- a/python-CherryPy.changes
+++ b/python-CherryPy.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Oct 30 13:15:39 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Skip known failing test upstream
+
+-------------------------------------------------------------------
+Fri Oct 11 07:43:34 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Do not remove cherrypy tests from distribution as other projects
+  use it for self testing too
+
+-------------------------------------------------------------------
+Mon Oct  7 13:26:26 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 18.3.0:
+  * Support handling multiple exceptions when processing hooks
+
 -------------------------------------------------------------------
 Tue Sep 24 08:49:15 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-CherryPy.spec b/python-CherryPy.spec
index 8a630da..b1d4ec7 100644
--- a/python-CherryPy.spec
+++ b/python-CherryPy.spec
@@ -19,11 +19,10 @@
 %define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-CherryPy
-Version:        18.2.0
+Version:        18.3.0
 Release:        0
 Summary:        Object-Oriented HTTP framework
 License:        BSD-3-Clause
-Group:          Development/Languages/Python
 URL:            http://www.cherrypy.org
 Source:         https://files.pythonhosted.org/packages/source/C/CherryPy/CherryPy-%{version}.tar.gz
 BuildRequires:  %{python_module setuptools_scm}
@@ -77,12 +76,14 @@ sed -i -e '/addopts/d' pytest.ini
 
 %install
 %python_install
-%python_expand rm -r %{buildroot}%{$python_sitelib}/cherrypy/test
+# 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
-%pytest -k 'not test_null_bytes'
+# 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'
 
 %post
 %python_install_alternative cherryd