diff --git a/aiohttp-3.6.0-fix-typeerror.patch b/aiohttp-3.6.0-fix-typeerror.patch
deleted file mode 100644
index 8c79ca8..0000000
--- a/aiohttp-3.6.0-fix-typeerror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Matthias Fehring <buschmann23@opensuse.org>
-Date: 2019-09-18 09:23:00 +0200
-Subject: fix type error
-Upstream: merged (https://github.com/aio-libs/aiohttp/pull/4057)
-
-At least multidict 4.5 is now required.
-
----
- setup.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/setup.py	2019-09-06 14:54:33.000000000 +0200
-+++ b/setup.py	2019-09-18 09:19:56.227118006 +0200
-@@ -71,7 +71,7 @@
- install_requires = [
-     'attrs>=17.3.0',
-     'chardet>=2.0,<4.0',
--    'multidict>=4.0,<5.0',
-+    'multidict>=4.5,<5.0',
-     'async_timeout>=3.0,<4.0',
-     'yarl>=1.0,<2.0',
-     'idna-ssl>=1.0; python_version<"3.7"',
diff --git a/aiohttp-3.6.0.tar.gz b/aiohttp-3.6.0.tar.gz
deleted file mode 100644
index 0f34887..0000000
--- a/aiohttp-3.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af7809ce7de6709afc7770403a70dfdbc4e988c91451108c8e123fac46b870d9
-size 1110800
diff --git a/aiohttp-3.6.1.tar.gz b/aiohttp-3.6.1.tar.gz
new file mode 100644
index 0000000..9425cbe
--- /dev/null
+++ b/aiohttp-3.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc55b1fec0e4cc1134ffb09ea3970783ee2906dc5dfd7cd16917913f2cfed65b
+size 1113678
diff --git a/python-aiohttp.changes b/python-aiohttp.changes
index 488d4a3..7476add 100644
--- a/python-aiohttp.changes
+++ b/python-aiohttp.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep 24 10:20:20 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 3.6.1:
+  * Compatibility with Python 3.8. #4056
+  * correct some exception string format #4068
+  * Emit a warning when ssl.OP_NO_COMPRESSION is unavailable because
+    the runtime is built against an outdated OpenSSL. #4052
+  * Update multidict requirement to >= 4.5 #4057
+- Drop merged patch aiohttp-3.6.0-fix-typeerror.patch
+
 -------------------------------------------------------------------
 Wed Sep 18 07:34:10 UTC 2019 - Matthias Fehring <buschmann23@opensuse.org>
 
diff --git a/python-aiohttp.spec b/python-aiohttp.spec
index bfe2b45..7434f7e 100644
--- a/python-aiohttp.spec
+++ b/python-aiohttp.spec
@@ -19,15 +19,13 @@
 %{?!python_module:%define python_module() python3-%{**}}
 %define skip_python2 1
 Name:           python-aiohttp
-Version:        3.6.0
+Version:        3.6.1
 Release:        0
 Summary:        Asynchronous HTTP client/server framework
 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
-# PATCH-FIX-UPSTREAM aiohttp-3.6.0-fix-typeerror.patch
-Patch0:         aiohttp-3.6.0-fix-typeerror.patch
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module async_timeout >= 3.0}
 BuildRequires:  %{python_module attrs >= 17.3.0}
@@ -95,7 +93,6 @@ HTML documentation on the API and examples for %{name}.
 
 %prep
 %setup -q -n aiohttp-%{version}
-%patch0 -p1
 
 %build
 export CFLAGS="%{optflags}"