diff --git a/sysutils/py-filelock/Makefile b/sysutils/py-filelock/Makefile
index 375b195cfef4..20817c41a921 100644
--- a/sysutils/py-filelock/Makefile
+++ b/sysutils/py-filelock/Makefile
@@ -1,34 +1,44 @@
 PORTNAME=	filelock
-DISTVERSION=	3.31.0
+DISTVERSION=	3.31.1
 CATEGORIES=	sysutils python
-MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Platform independent file lock
-WWW=		https://github.com/benediktschmitt/py-filelock
+WWW=		https://github.com/tox-dev/py-filelock
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=1.29:devel/py-hatchling@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}hatch-vcs>=0.5:devel/py-hatch-vcs@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}covdefaults>=2.3:devel/py-covdefaults@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>=7.6.1:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}diff-cover>=10.2:devel/py-diff-cover@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=1.3:devel/py-pytest-asyncio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>=3.15.1:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>=2.4:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=21.2:devel/py-virtualenv@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	pep517 autoplist pytest
+USE_GITHUB=	yes
+GH_ACCOUNT=	tox-dev
+GH_PROJECT=	py-filelock
+WRKSRC=		${WRKDIR}/filelock-${DISTVERSION}
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
-# tests as of 3.29.7: 519 passed, 25 skipped, 6 warnings in 46.17s
+MAKE_ENV+=	SETUPTOOLS_SCM_PRETEND_VERSION=${DISTVERSION}
+
+PYTEST_BROKEN_TESTS=	test_process_start_token_is_int_for_self \
+			test_owner_is_stale_live_process_matching_token_held \
+			test_owner_is_stale_live_process_mismatched_token_reclaimed \
+			test_final_symlink_backend_refuses_to_lock
+
+# tests as of 3.31.1: 1228 passed, 56 skipped, 4 deselected in 107.62s
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-filelock/distinfo b/sysutils/py-filelock/distinfo
index 24b8e1045690..b323697f53b1 100644
--- a/sysutils/py-filelock/distinfo
+++ b/sysutils/py-filelock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1784356178
-SHA256 (filelock-3.31.0.tar.gz) = c188cbc4307c18894c5424fa73f97ea7fa127ddf62192487546da3a214d0a381
-SIZE (filelock-3.31.0.tar.gz) = 180931
+TIMESTAMP = 1784567269
+SHA256 (tox-dev-py-filelock-3.31.1_GH0.tar.gz) = 5ca842eac0029d66c57f579cba334965dc92098cde40e2799704c2cfdb2726e7
+SIZE (tox-dev-py-filelock-3.31.1_GH0.tar.gz) = 457905