diff --git a/www/uwsgi/Makefile b/www/uwsgi/Makefile
index 89844a898c1d..bcb726b5fa08 100644
--- a/www/uwsgi/Makefile
+++ b/www/uwsgi/Makefile
@@ -1,83 +1,85 @@
 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
 
 MAKE_ENV+=	CPUCOUNT=${MAKE_JOBS_NUMBER} UWSGI_EMBED_PLUGINS=cgi
 
 PYSETUP=			uwsgiconfig.py
 PYDISTUTILS_BUILD_TARGET=	--build
 PYDISTUTILS_BUILDARGS=		--verbose
 
 USERS=		uwsgi
 GROUPS=		uwsgi
 
 PLIST_FILES=	bin/uwsgi \
 		${PYTHON_SITELIBDIR}/uwsgidecorators.py
 
 SUB_LIST=	PYTHON_VER=${PYTHON_VER}
 
 OPTIONS_DEFINE=		DEBUG JSON PCRE XML SSL
 OPTIONS_DEFAULT=	SSL
 
 OPTIONS_GROUP=		PLG
 OPTIONS_GROUP_PLG=	COROAE LOGPIPE PSGI
 
 PLG_DESC=		Enable plugins
 COROAE_DESC=		Coro::AnyEvent support
 LOGPIPE_DESC=		Pipe logger support
 PSGI_DESC=		PSGI embedded plugin
 
 COROAE_BUILD_DEPENDS=	p5-Coro>=0:devel/p5-Coro
 COROAE_IMPLIES=		PSGI
 
 DEBUG_VARS=		PYDISTUTILS_BUILDARGS+=--debug
 
 JSON_VARS=		BUILDCONF_JSON=jansson
 JSON_LIB_DEPENDS=	libjansson.so:devel/jansson
 
 PCRE_VARS=		BUILDCONF_PCRE=true
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
 PSGI_USES=		perl5
 
 XML_VARS=		BUILDCONF_XML=libxml2
 XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 SSL_VARS=		BUILDCONF_SSL=true
 SSL_USES=		ssl
 SSL_CFLAGS=		-I${OPENSSLINC}
 SSL_LDFLAGS=		${OPENSSL_LDFLAGS}
 
 post-patch:
 .for var in JSON PCRE XML SSL
 	@${REINPLACE_CMD} -e '/^${var:tl} =/ s|= .*|= ${BUILDCONF_${var}:Ufalse}|' ${WRKSRC}/buildconf/base.ini
 .endfor
 
 .for plugin in COROAE LOGPIPE PSGI
 post-patch-${plugin}-on:
 	@${REINPLACE_CMD} -e 's/%(main_plugin)s,/& ${plugin:tl},/' \
 		${WRKSRC}/buildconf/base.ini
 .endfor
 
 do-configure:
 	@${DO_NADA}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/uwsgidecorators.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 .include <bsd.port.mk>
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'