diff --git a/python-aiohttp.changes b/python-aiohttp.changes
index 7476add..105b0a0 100644
--- a/python-aiohttp.changes
+++ b/python-aiohttp.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 10 08:15:55 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Do remove pytest configuration to not error out on deprecation
+  warnings
+- Unbundle http parser headers:
+  * unbundle-http-parser.patch
+
 -------------------------------------------------------------------
 Tue Sep 24 10:20:20 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-aiohttp.spec b/python-aiohttp.spec
index 7434f7e..f1b87fe 100644
--- a/python-aiohttp.spec
+++ b/python-aiohttp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-aiohttp
 #
-# 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
@@ -26,6 +26,7 @@ License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            https://github.com/aio-libs/aiohttp
 Source:         https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-%{version}.tar.gz
+Patch0:         unbundle-http-parser.patch
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module async_timeout >= 3.0}
 BuildRequires:  %{python_module attrs >= 17.3.0}
@@ -34,6 +35,7 @@ BuildRequires:  %{python_module devel >= 3.5.3}
 BuildRequires:  %{python_module multidict >= 4.5}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
+BuildRequires:  http-parser-devel
 BuildRequires:  python-rpm-macros
 Requires:       python >= 3.5.3
 Requires:       python-async_timeout >= 3.0
@@ -93,6 +95,8 @@ HTML documentation on the API and examples for %{name}.
 
 %prep
 %setup -q -n aiohttp-%{version}
+%patch0 -p1
+rm pytest.ini
 
 %build
 export CFLAGS="%{optflags}"
diff --git a/unbundle-http-parser.patch b/unbundle-http-parser.patch
new file mode 100644
index 0000000..849657a
--- /dev/null
+++ b/unbundle-http-parser.patch
@@ -0,0 +1,23 @@
+diff -Nur aiohttp-3.6.1/aiohttp/_cparser.pxd aiohttp-3.6.1.new/aiohttp/_cparser.pxd
+--- aiohttp-3.6.1/aiohttp/_cparser.pxd	2019-09-19 17:52:35.000000000 +0200
++++ aiohttp-3.6.1.new/aiohttp/_cparser.pxd	2019-09-21 15:54:52.313964294 +0200
+@@ -1,7 +1,7 @@
+ from libc.stdint cimport uint16_t, uint32_t, uint64_t
+ 
+ 
+-cdef extern from "../vendor/http-parser/http_parser.h":
++cdef extern from "http_parser.h":
+     ctypedef int (*http_data_cb) (http_parser*,
+                                   const char *at,
+                                   size_t length) except -1
+diff -Nur aiohttp-3.6.1/setup.py aiohttp-3.6.1.new/setup.py
+--- aiohttp-3.6.1/setup.py	2019-09-19 17:52:35.000000000 +0200
++++ aiohttp-3.6.1.new/setup.py	2019-09-21 15:55:15.423495152 +0200
+@@ -27,7 +27,6 @@
+ extensions = [Extension('aiohttp._websocket', ['aiohttp/_websocket.c']),
+               Extension('aiohttp._http_parser',
+                         ['aiohttp/_http_parser.c',
+-                         'vendor/http-parser/http_parser.c',
+                          'aiohttp/_find_header.c'],
+                         define_macros=[('HTTP_PARSER_STRICT', 0)],
+                         ),