diff --git a/www/uwsgi/Makefile b/www/uwsgi/Makefile
index 89844a898c1d..bcb726b5fa08 100644
--- a/www/uwsgi/Makefile
+++ b/www/uwsgi/Makefile
@@ -1,17 +1,19 @@
 PORTNAME=	uwsgi
-PORTVERSION=	2.0.20
+PORTVERSION=	2.0.21
 CATEGORIES=	www python
-MASTER_SITES=	http://projects.unbit.it/downloads/
+PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
-MAINTAINER=	eugene@zhegan.in
+MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Developer-friendly WSGI server which uses uwsgi protocol
 WWW=		https://projects.unbit.it/uwsgi/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe pkgconfig python:3.6-3.10
-USE_PYTHON=	distutils concurrent optsuffix
+USES=		cpe pkgconfig python:3.6+
+USE_GITHUB=	yes
+GH_ACCOUNT=	unbit
+USE_PYTHON=	distutils concurrent
 USE_RC_SUBR=	uwsgi
 CPE_VENDOR=	unbit
 
diff --git a/www/uwsgi/distinfo b/www/uwsgi/distinfo
index 3006a759cfdf..c7472816d1d2 100644
--- a/www/uwsgi/distinfo
+++ b/www/uwsgi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637775824
-SHA256 (uwsgi-2.0.20.tar.gz) = 88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9
-SIZE (uwsgi-2.0.20.tar.gz) = 804906
+TIMESTAMP = 1667404884
+SHA256 (unbit-uwsgi-2.0.21_GH0.tar.gz) = 35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9
+SIZE (unbit-uwsgi-2.0.21_GH0.tar.gz) = 808494
diff --git a/www/uwsgi/files/patch-plugins_coroae_uwsgiplugin.py b/www/uwsgi/files/patch-plugins_coroae_uwsgiplugin.py
deleted file mode 100644
index 75098182c3c1..000000000000
--- a/www/uwsgi/files/patch-plugins_coroae_uwsgiplugin.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/coroae/uwsgiplugin.py.orig	2020-06-17 09:03:34 UTC
-+++ plugins/coroae/uwsgiplugin.py
-@@ -9,7 +9,7 @@ for p in search_paths:
-         coroapi = p
- 
- if not coroapi:
--    print "unable to find the Coro perl module !!!"
-+    print("unable to find the Coro perl module !!!")
-     sys.exit(1)
- 
- NAME='coroae'