diff --git a/python-cheroot.changes b/python-cheroot.changes
index ed98215..7b96802 100644
--- a/python-cheroot.changes
+++ b/python-cheroot.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 19 10:35:40 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to fix build with python 3.8.3:
+  * python383.patch
+
 -------------------------------------------------------------------
 Thu May  7 09:33:29 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
 
diff --git a/python-cheroot.spec b/python-cheroot.spec
index ef4a0ef..1cb86f8 100644
--- a/python-cheroot.spec
+++ b/python-cheroot.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-cheroot
 #
-# Copyright (c) 2020 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
@@ -28,7 +28,8 @@ URL:            https://github.com/cherrypy/cheroot
 Source:         https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 # PATCH-FIX_UPSTREAM //github.com/cherrypy/cheroot/pull/282
 Patch1:         0001-Avoid-race-condition-on-persistent-HTTP-connections.patch
-
+# PATCH-FIX-UPSTREAM pr#280
+Patch2:         python383.patch
 BuildRequires:  %{python_module jaraco.functools}
 BuildRequires:  %{python_module jaraco.text >= 3.1}
 BuildRequires:  %{python_module more-itertools >= 2.6}
diff --git a/python383.patch b/python383.patch
new file mode 100644
index 0000000..9b761be
--- /dev/null
+++ b/python383.patch
@@ -0,0 +1,57 @@
+From 554972e7c3142c4e82e2ac38a019ef403f8f4e3d Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" <jaraco@jaraco.com>
+Date: Sun, 12 Apr 2020 13:46:08 -0400
+Subject: [PATCH 1/2] Remove fixture, undocumented and presumed unneeded.
+
+---
+ cheroot/test/test_server.py | 26 +-------------------------
+ 1 file changed, 1 insertion(+), 25 deletions(-)
+
+Index: cheroot-8.3.0/cheroot/test/test_server.py
+===================================================================
+--- cheroot-8.3.0.orig/cheroot/test/test_server.py
++++ cheroot-8.3.0/cheroot/test/test_server.py
+@@ -23,7 +23,6 @@ from ..testing import (
+     ANY_INTERFACE_IPV4,
+     ANY_INTERFACE_IPV6,
+     EPHEMERAL_PORT,
+-    get_server_client,
+ )
+ 
+ 
+@@ -167,19 +166,19 @@ class _TestGateway(Gateway):
+ 
+ 
+ @pytest.fixture
+-def peercreds_enabled_server_and_client(http_server, unix_sock_file):
++def peercreds_enabled_server(http_server, unix_sock_file):
+     """Construct a test server with ``peercreds_enabled``."""
+     httpserver = http_server.send(unix_sock_file)
+     httpserver.gateway = _TestGateway
+     httpserver.peercreds_enabled = True
+-    return httpserver, get_server_client(httpserver)
++    return httpserver
+ 
+ 
+ @unix_only_sock_test
+ @non_macos_sock_test
+-def test_peercreds_unix_sock(peercreds_enabled_server_and_client):
++def test_peercreds_unix_sock(peercreds_enabled_server):
+     """Check that ``PEERCRED`` lookup works when enabled."""
+-    httpserver, testclient = peercreds_enabled_server_and_client
++    httpserver = peercreds_enabled_server
+     bind_addr = httpserver.bind_addr
+ 
+     if isinstance(bind_addr, six.binary_type):
+@@ -208,9 +207,9 @@ def test_peercreds_unix_sock(peercreds_e
+ )
+ @unix_only_sock_test
+ @non_macos_sock_test
+-def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server_and_client):
++def test_peercreds_unix_sock_with_lookup(peercreds_enabled_server):
+     """Check that ``PEERCRED`` resolution works when enabled."""
+-    httpserver, testclient = peercreds_enabled_server_and_client
++    httpserver = peercreds_enabled_server
+     httpserver.peercreds_resolve_enabled = True
+ 
+     bind_addr = httpserver.bind_addr