diff --git a/databases/py-asyncpg/Makefile b/databases/py-asyncpg/Makefile
index 15e75d43286b..f8df3e1ef1ae 100644
--- a/databases/py-asyncpg/Makefile
+++ b/databases/py-asyncpg/Makefile
@@ -1,30 +1,34 @@
 # Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
 
 PORTNAME=	asyncpg
 PORTVERSION=	0.25.0
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	High performance PostgreSQL Client Library for Python/asyncio
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe pgsql:9.2+ python:3.6+
 CPE_VENDOR=	magic
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent cython distutils
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	PKG-INFO README.rst
 
+post-extract:
+	@${RM} ${WRKSRC}/asyncpg/pgproto/*.c
+	@${RM} ${WRKSRC}/asyncpg/protocol/*.c
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/asyncpg/protocol/protocol*.so
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/asyncpg/pgproto/pgproto*.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/databases/py-asyncpg/files/patch-setup.py b/databases/py-asyncpg/files/patch-setup.py
new file mode 100644
index 000000000000..ed2110d636d1
--- /dev/null
+++ b/databases/py-asyncpg/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2021-11-16 22:38:59 UTC
++++ setup.py
+@@ -25,7 +25,7 @@ from setuptools.command import sdist as setuptools_sdi
+ from setuptools.command import build_ext as setuptools_build_ext
+ 
+ 
+-CYTHON_DEPENDENCY = 'Cython(>=0.29.24,<0.30.0)'
++CYTHON_DEPENDENCY = 'Cython(>=0.29.24)'
+ 
+ # Minimal dependencies required to test asyncpg.
+ TEST_DEPENDENCIES = [