diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile
index f2e542145d5..29c37424a31 100644
--- a/www/py-aiohttp/Makefile
+++ b/www/py-aiohttp/Makefile
@@ -1,10 +1,8 @@
 COMMENT =		http client/server for asyncio
 
-# 3.8.0 adds new deps on frozenlist, aiosignal
-MODPY_EGG_VERSION =	3.7.4
+MODPY_EGG_VERSION =	3.8.3
 DISTNAME =		aiohttp-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
 
 CATEGORIES =		www
 
@@ -19,23 +17,36 @@ FLAVORS =		python3
 
 MODPY_PI =		Yes
 MODPY_PYBUILD =		setuptools
-# XXX some tests fail as we don't have ports for re_assert and async_generator
+# disable tests using "proxy" and "re_assert" modules which aren't in ports
+MODPY_PYTEST_ARGS =	--ignore tests/test_proxy_functional.py \
+			--ignore tests/test_client_session.py \
+			--ignore tests/test_streams.py \
+			--ignore tests/test_urldispatch.py \
+			--ignore tests/test_web_response.py
 
-RUN_DEPENDS =		devel/py-async-timeout${MODPY_FLAVOR} \
-			devel/py-attrs${MODPY_FLAVOR}>=17.3.0 \
-			devel/py-typing-extensions${MODPY_FLAVOR}>=3.6.5 \
-			textproc/py-chardet${MODPY_FLAVOR}>=2.0 \
-			www/py-multidict${MODPY_FLAVOR}>=4.5 \
-			www/py-yarl${MODPY_FLAVOR}
+RUN_DEPENDS =		devel/py-attrs${MODPY_FLAVOR}>=17.3.0 \
+			textproc/py-charset-normalizer${MODPY_FLAVOR} \
+			www/py-multidict${MODPY_FLAVOR}<7 \
+			devel/py-async-timeout${MODPY_FLAVOR}<5 \
+			www/py-yarl${MODPY_FLAVOR}<2 \
+			devel/py-frozenlist${MODPY_FLAVOR} \
+			devel/py-aiosignal${MODPY_FLAVOR}
+# optional, but let's avoid different behaviour depending on whether
+# they're installed
+RUN_DEPENDS +=		archivers/py-brotli${MODPY_FLAVOR} \
+			net/py-aiodns${MODPY_FLAVOR}
 
 TEST_DEPENDS =		devel/py-freezegun${MODPY_FLAVOR} \
 			devel/py-test${MODPY_FLAVOR} \
 			devel/py-test-cov${MODPY_FLAVOR} \
+			devel/py-test-mock${MODPY_FLAVOR} \
 			devel/py-test-timeout${MODPY_FLAVOR} \
 			devel/py-test-xdist${MODPY_FLAVOR} \
+			security/py-trustme${MODPY_FLAVOR} \
 			www/py-gunicorn${MODPY_FLAVOR}
 
-# junk piles seen in pypi distribution of 3.7.3, 3.7.4
+# cython files relating to upstream's build environment; unsure
+# exactly what they're for but don't seem useful to package
 post-extract:
 	rm -rf ${WRKSRC}/aiohttp/.hash
 
diff --git a/www/py-aiohttp/distinfo b/www/py-aiohttp/distinfo
index f57e8d419c3..98c76478674 100644
--- a/www/py-aiohttp/distinfo
+++ b/www/py-aiohttp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aiohttp-3.7.4.tar.gz) = XYTsxzFB0KDWHs4HQrt/9XUbBlfauEBfiZ086xBMx94=
-SIZE (aiohttp-3.7.4.tar.gz) = 1114533
+SHA256 (aiohttp-3.8.3.tar.gz) = OCj7QbcgMXa4L+XWmeDYRUNfI3R1CkS0gOprkw9r4mk=
+SIZE (aiohttp-3.8.3.tar.gz) = 7337480
diff --git a/www/py-aiohttp/patches/patch-setup_cfg b/www/py-aiohttp/patches/patch-setup_cfg
new file mode 100644
index 00000000000..3ef10b5250d
--- /dev/null
+++ b/www/py-aiohttp/patches/patch-setup_cfg
@@ -0,0 +1,12 @@
+Index: setup.cfg
+--- setup.cfg.orig
++++ setup.cfg
+@@ -47,7 +47,7 @@ zip_safe = False
+ include_package_data = True
+ install_requires = 
+ 	attrs >= 17.3.0
+-	charset-normalizer >=2.0, < 3.0
++	charset-normalizer >=2.0, < 4.0
+ 	multidict >=4.5, < 7.0
+ 	async_timeout >= 4.0.0a3, < 5.0
+ 	asynctest == 0.13.0; python_version<"3.8"
diff --git a/www/py-aiohttp/patches/patch-setup_py b/www/py-aiohttp/patches/patch-setup_py
deleted file mode 100644
index e9c6b593f42..00000000000
--- a/www/py-aiohttp/patches/patch-setup_py
+++ /dev/null
@@ -1,17 +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)
-
-Index: setup.py
---- setup.py.orig
-+++ setup.py
-@@ -66,7 +66,7 @@ except IndexError:
- 
- install_requires = [
-     "attrs>=17.3.0",
--    "chardet>=2.0,<4.0",
-+    "chardet>=2.0,<5.0",
-     "multidict>=4.5,<7.0",
-     "async_timeout>=3.0,<4.0",
-     "yarl>=1.0,<2.0",
diff --git a/www/py-aiohttp/pkg/PLIST b/www/py-aiohttp/pkg/PLIST
index 58b2af479b5..2da1fed4fde 100644
--- a/www/py-aiohttp/pkg/PLIST
+++ b/www/py-aiohttp/pkg/PLIST
@@ -30,8 +30,6 @@ lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}cookiejar.${MOD
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}cookiejar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}formdata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}formdata.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}frozenlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}frozenlist.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}hdrs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}hdrs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -60,8 +58,6 @@ lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}pytest_plugin.$
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}pytest_plugin.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}streams.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}streams.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}tcp_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -103,24 +99,15 @@ lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}web_ws.${MODPY_
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_cparser.pxd
-lib/python${MODPY_VERSION}/site-packages/aiohttp/_find_header.c
-lib/python${MODPY_VERSION}/site-packages/aiohttp/_find_header.h
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_find_header.pxd
-lib/python${MODPY_VERSION}/site-packages/aiohttp/_frozenlist.c
-@so lib/python${MODPY_VERSION}/site-packages/aiohttp/_frozenlist.${MODPY_PYC_MAGIC_TAG}so
-lib/python${MODPY_VERSION}/site-packages/aiohttp/_frozenlist.pyx
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_headers.pxi
-lib/python${MODPY_VERSION}/site-packages/aiohttp/_helpers.c
 @so lib/python${MODPY_VERSION}/site-packages/aiohttp/_helpers.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_helpers.pyi
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_helpers.pyx
-lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_parser.c
 @so lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_parser.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_parser.pyx
-lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_writer.c
 @so lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_writer.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_http_writer.pyx
-lib/python${MODPY_VERSION}/site-packages/aiohttp/_websocket.c
 @so lib/python${MODPY_VERSION}/site-packages/aiohttp/_websocket.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/aiohttp/_websocket.pyx
 lib/python${MODPY_VERSION}/site-packages/aiohttp/abc.py
@@ -133,8 +120,6 @@ lib/python${MODPY_VERSION}/site-packages/aiohttp/client_ws.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/connector.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/cookiejar.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/formdata.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/frozenlist.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/frozenlist.pyi
 lib/python${MODPY_VERSION}/site-packages/aiohttp/hdrs.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/helpers.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/http.py
@@ -150,8 +135,6 @@ lib/python${MODPY_VERSION}/site-packages/aiohttp/payload_streamer.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/py.typed
 lib/python${MODPY_VERSION}/site-packages/aiohttp/pytest_plugin.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/resolver.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/signals.py
-lib/python${MODPY_VERSION}/site-packages/aiohttp/signals.pyi
 lib/python${MODPY_VERSION}/site-packages/aiohttp/streams.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/tcp_helpers.py
 lib/python${MODPY_VERSION}/site-packages/aiohttp/test_utils.py