diff --git a/healthcheck.patch b/healthcheck.patch
index b0ec0eb..82cccdd 100644
--- a/healthcheck.patch
+++ b/healthcheck.patch
@@ -1,8 +1,6 @@
-Index: hpack-3.0.0/test/test_hpack.py
-===================================================================
---- hpack-3.0.0.orig/test/test_hpack.py
-+++ hpack-3.0.0/test/test_hpack.py
-@@ -8,7 +8,7 @@ from hpack.struct import HeaderTuple, Ne
+--- a/test/test_hpack.py
++++ b/test/test_hpack.py
+@@ -2,7 +2,7 @@
  import itertools
  import pytest
  
@@ -10,8 +8,8 @@ Index: hpack-3.0.0/test/test_hpack.py
 +from hypothesis import given, settings, HealthCheck
  from hypothesis.strategies import text, binary, sets, one_of
  
- try:
-@@ -749,6 +749,7 @@ class TestDictToIterable(object):
+ from hpack import (
+@@ -760,6 +760,7 @@ class TestDictToIterable:
          binary().filter(lambda k: k and not k.startswith(b':'))
      )
  
@@ -19,7 +17,7 @@ Index: hpack-3.0.0/test/test_hpack.py
      @given(
          special_keys=sets(keys),
          boring_keys=sets(keys),
-@@ -786,6 +787,7 @@ class TestDictToIterable(object):
+@@ -797,6 +798,7 @@ class TestDictToIterable:
          assert special_keys == received_special
          assert boring_keys == received_boring
  
diff --git a/hpack-3.0.0.tar.gz b/hpack-3.0.0.tar.gz
deleted file mode 100644
index 33f9fd8..0000000
--- a/hpack-3.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2
-size 43321
diff --git a/hpack-4.0.0.tar.gz b/hpack-4.0.0.tar.gz
new file mode 100644
index 0000000..1540d4f
--- /dev/null
+++ b/hpack-4.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095
+size 49117
diff --git a/pytest5.patch b/pytest5.patch
deleted file mode 100644
index 3a87a4d..0000000
--- a/pytest5.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 97207a9e88f906cf8e4198aec20b24ef97764486 Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <lars4839@umn.edu>
-Date: Fri, 22 Nov 2019 10:50:51 -0600
-Subject: [PATCH] Automatically merge Dependabot PRs with Mergify (#175)
-
----
- test/test_table.py    |  2 +-
- 5 files changed, 14 insertions(+), 11 deletions(-)
-
-index d77c30a..ca4729b 100644
---- a/test/test_table.py
-+++ b/test/test_table.py
-@@ -46,7 +46,7 @@ def test_get_by_index_out_of_range(self):
-             tbl.get_by_index(off + 2)
- 
-         assert (
--            "InvalidTableIndex: Invalid table index %d" % (off + 2) in str(e)
-+            "Invalid table index %d" % (off + 2) in str(e.value)
-         )
- 
-     def test_repr(self):
diff --git a/python-hpack.changes b/python-hpack.changes
index f879e97..31e3f90 100644
--- a/python-hpack.changes
+++ b/python-hpack.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Dec 15 21:36:53 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Upgrade to 4.0.0:
+  - remove pytest5.patch, which was included in the upstream tarball.
+  - support for Python < 3.6 (including 2.7) has been removed.
+  - support for Python 3.8 has been added.
+  - Performance improvement of static header search. Use dict search
+    instead of linear search.
+  - Fix debug output of headers during encoding.
+
 -------------------------------------------------------------------
 Wed May  6 07:37:26 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-hpack.spec b/python-hpack.spec
index 8986e87..b71d161 100644
--- a/python-hpack.spec
+++ b/python-hpack.spec
@@ -18,14 +18,14 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-hpack
-Version:        3.0.0
+Version:        4.0.0
 Release:        0
 Summary:        Pure-Python HPACK header compression
 License:        MIT
 URL:            https://github.com/python-hyper/hpack
-Source:         https://files.pythonhosted.org/packages/source/h/hpack/hpack-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/h/hpack/hpack-%{version}.tar.gz
+Source1:        test_fixtures.tar.xz
 Patch0:         healthcheck.patch
-Patch1:         pytest5.patch
 BuildRequires:  %{python_module hypothesis}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
@@ -40,8 +40,7 @@ Python programs that implement HTTP/2. It also contains a compatibility layer th
 automatically enables the use of nghttp2 if it’s available.
 
 %prep
-%setup -q -n hpack-%{version}
-%autopatch -p1
+%autosetup -p1 -a1 -n hpack-%{version}
 
 %build
 export LC_ALL="en_US.UTF-8"
@@ -57,7 +56,7 @@ export LC_ALL="en_US.UTF-8"
 
 %files %{python_files}
 %license LICENSE
-%doc HISTORY.rst CONTRIBUTORS.rst README.rst
+%doc CHANGELOG.rst CONTRIBUTORS.rst README.rst
 %{python_sitelib}/hpack
 %{python_sitelib}/hpack-%{version}-py%{python_version}.egg-info
 
diff --git a/test_fixtures.tar.xz b/test_fixtures.tar.xz
new file mode 100644
index 0000000..ea6881b
--- /dev/null
+++ b/test_fixtures.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:588e1c61d6d42ade263e6282b6fbcd6ff26b9dc8ba1da28f55a56fc51b70e8c0
+size 1750372