diff --git a/cheroot-5.4.0.tar.gz b/cheroot-5.4.0.tar.gz
deleted file mode 100644
index 356e340..0000000
--- a/cheroot-5.4.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4b3d2eaa949b8a2f6676e3bca7c68cd358e4aa6bab437362b4bee6781626135
-size 56272
diff --git a/cheroot-6.5.4.tar.gz b/cheroot-6.5.4.tar.gz
new file mode 100644
index 0000000..983eaaa
--- /dev/null
+++ b/cheroot-6.5.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:beb8eb9eeff5746059607e81b72efd6f4ca099111dc13f8961ae9e4f63f7786b
+size 81067
diff --git a/python-cheroot.changes b/python-cheroot.changes
index ad28fb9..626ffa8 100644
--- a/python-cheroot.changes
+++ b/python-cheroot.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar  5 12:26:41 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 6.5.4:
+  * too many changes to enumerate see CHANGES.rst
+- Make sure to execute testsuite
+
 -------------------------------------------------------------------
 Fri Mar 31 13:39:53 UTC 2017 - jmatejek@suse.com
 
diff --git a/python-cheroot.spec b/python-cheroot.spec
index 385328c..5fce53f 100644
--- a/python-cheroot.spec
+++ b/python-cheroot.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package python-Cheroot
+# spec file for package python-cheroot
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,28 +12,43 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-cheroot
-Version:        5.4.0
+Version:        6.5.4
 Release:        0
-License:        BSD-3-Clause
 Summary:        Highly-optimized, pure-python HTTP server
-Url:            https://github.com/cherrypy/cheroot
+License:        BSD-3-Clause
 Group:          Development/Languages/Python
-Source:         https://files.pythonhosted.org/packages/source/C/Cheroot/cheroot-%{version}.tar.gz
-BuildRequires:  python-rpm-macros
+URL:            https://github.com/cherrypy/cheroot
+Source:         https://files.pythonhosted.org/packages/source/c/cheroot/cheroot-%{version}.tar.gz
+BuildRequires:  %{python_module more-itertools >= 2.6}
+BuildRequires:  %{python_module pyOpenSSL}
+BuildRequires:  %{python_module pytest >= 2.8}
+BuildRequires:  %{python_module pytest-mock}
+BuildRequires:  %{python_module requests-unixsocket}
+BuildRequires:  %{python_module requests}
+BuildRequires:  %{python_module setuptools_scm >= 1.15.0}
+BuildRequires:  %{python_module setuptools_scm_git_archive >= 1.0}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module setuptools_scm}
+BuildRequires:  %{python_module six >= 1.11.0}
+BuildRequires:  %{python_module trustme}
+BuildRequires:  fdupes
+BuildRequires:  python-backports.functools_lru_cache
+BuildRequires:  python-rpm-macros
+Requires:       python-more-itertools >= 2.6
+Requires:       python-six >= 1.11.0
 # the package and distribution name is lowercase-cheroot,
 # but PyPI claims the name is capital-Cheroot
 # *smacks head against desk*
 Provides:       python-Cheroot = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-
+%ifpython2
+Requires:       python-backports.functools_lru_cache
+%endif
 %python_subpackages
 
 %description
@@ -41,18 +56,23 @@ Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
 
 %prep
 %setup -q -n cheroot-%{version}
+# do not require cov/xdist/etc
+sed -i -e '/addopts/d' pytest.ini
 
 %build
 %python_build
 
 %install
 %python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-#%%check
-# apparently the test suite is nonfunctional and is exercised by CherryPy only
+%check
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v
 
 %files %{python_files}
-%defattr(-,root,root,-)
+%license LICENSE.md
+%doc README.rst CHANGES.rst
+%python3_only %{_bindir}/cheroot
 %{python_sitelib}/*
 
 %changelog