diff --git a/srcpkgs/python3-aiohttp/patches/chardet-version.patch b/srcpkgs/python3-aiohttp/patches/chardet-version.patch
deleted file mode 100644
index 91cc8ca7efb182..00000000000000
--- a/srcpkgs/python3-aiohttp/patches/chardet-version.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b0ed732d0a637e43c72bb1a777d02776cde37376 Mon Sep 17 00:00:00 2001
-From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
-Date: Fri, 11 Dec 2020 10:24:17 +0200
-Subject: [PATCH] Bump chardet from 3.0.4 to 4.0.0 (#5333)
-
-Bumps [chardet](https://github.com/chardet/chardet) from 3.0.4 to 4.0.0.
-- [Release notes](https://github.com/chardet/chardet/releases)
-- [Commits](https://github.com/chardet/chardet/compare/3.0.4...4.0.0)
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
-Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
----
- requirements/base.txt | 2 +-
- setup.py              | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git setup.py setup.py
-index a9edd5d0c8..54b548c7b4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -66,7 +66,7 @@
- 
- install_requires = [
-     "attrs>=17.3.0",
--    "chardet>=2.0,<4.0",
-+    "chardet>=2.0,<5.0",
-     "multidict>=4.5,<7.0",
-     "async_timeout>=4.0a2,<5.0",
-     'asynctest==0.13.0; python_version<"3.8"',
diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template
index 25009551d463dc..1143dcf4d8d65e 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,40 @@
 # Template file for 'python3-aiohttp'
 pkgname=python3-aiohttp
-version=3.7.4
-revision=4
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=3.8.5
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
 makedepends="python3-devel http-parser-devel"
-depends="python3-async-timeout python3-attrs python3-chardet python3-yarl
- python3-typing_extensions python3-multidict"
+depends="python3-aiosignal python3-async-timeout python3-attrs
+ python3-chardet python3-yarl python3-typing_extensions python3-multidict"
+checkdepends="$depends python3-aiosignal python3-async_generator python3-Brotli
+ python3-charset-normalizer python3-freezegun python3-proxy.py python3-pytest
+ python3-pytest-cov python3-pytest-forked python3-pytest-mock
+ python3-pytest-timeout python3-pytest-xdist python3-re_assert"
 short_desc="HTTP client/server for asyncio (PEP-3156)"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://aiohttp.readthedocs.io/"
 distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
-checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de
+checksum=b9552ec52cc147dbf1944ac7ac98af7602e51ea2dcd076ed194ca3c0d1c7d0bc
 
 post_patch() {
 	# use system http-parser
 	vsed -i '/http_parser\.c/d' -i setup.py
 	vsed -i '/http_parser\.h/s/".*\//"/' -i aiohttp/_cparser.pxd
 }
+
+do_check() {
+	# Failing tests, cf. https://github.com/aio-libs/aiohttp/issues/7255
+	local skiptests
+	skiptests+=" test_no_warnings[aiohttp._helpers] or"
+	skiptests+=" test_no_warnings[aiohttp._http_parser] or"
+	skiptests+=" test_no_warnings[aiohttp._http_writer] or"
+	skiptests+=" test_no_warnings[aiohttp._websocket] or"
+	skiptests+=" test_no_warnings[aiohttp.worker] or"
+	skiptests+=" test_c_parser_loaded or"
+	skiptests+=" test_invalid_character[pyloop] or"
+	skiptests+=" test_unsupported_upgrade[pyloop]"
+
+	PYTHONPATH=$(cd build/lib* && pwd) pytest -k "not (${skiptests})"
+}