diff --git a/www/py-wfuzz/Makefile b/www/py-wfuzz/Makefile
index edcac26300a1..9d12a58788b0 100644
--- a/www/py-wfuzz/Makefile
+++ b/www/py-wfuzz/Makefile
@@ -1,25 +1,36 @@
 PORTNAME=	wfuzz
-DISTVERSION=	3.1.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.1.1
 CATEGORIES=	www security python
-MASTER_SITES=	PYPI
+#MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Web application fuzzer allowing to find vulnerabilities in them
-WWW=		https://wfuzz.readthedocs.io/en/latest
+WWW=		https://wfuzz.readthedocs.io/en/latest \
+		https://github.com/xmendez/wfuzz
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	distutils concurrent autoplist
+USE_PYTHON=	autoplist concurrent pep517
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	xmendez
+
 NO_ARCH=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|3.1.0|${DISTVERSION}|' \
+		${WRKSRC}/src/wfuzz/__init__.py
+
 .include <bsd.port.mk>
diff --git a/www/py-wfuzz/distinfo b/www/py-wfuzz/distinfo
index 0a0b3dc0d28f..68f409ceb225 100644
--- a/www/py-wfuzz/distinfo
+++ b/www/py-wfuzz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607591918
-SHA256 (wfuzz-3.1.0.tar.gz) = 0965f5968f5340ff0c54974164d51f9c08939e149bf2574e905d0df423789738
-SIZE (wfuzz-3.1.0.tar.gz) = 103099
+TIMESTAMP = 1773370872
+SHA256 (xmendez-wfuzz-v3.1.1_GH0.tar.gz) = 2bdea54025474aefd3a0bb0a0a395d633527e3296e385b2a9e476e42f17bdb59
+SIZE (xmendez-wfuzz-v3.1.1_GH0.tar.gz) = 441720