diff --git a/hebrew/py-pyluach/Makefile b/hebrew/py-pyluach/Makefile
index 8cd0b69915c5..02df7d24c6d1 100644
--- a/hebrew/py-pyluach/Makefile
+++ b/hebrew/py-pyluach/Makefile
@@ -1,23 +1,33 @@
 PORTNAME=	pyluach
-DISTVERSION=	2.0.2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.2.0
 CATEGORIES=	hebrew python
-MASTER_SITES=	PYPI
+#MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python package for manipulating Hebrew dates
 WWW=		https://github.com/simlist/pyluach
 
 LICENSE=	MIT
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>0:devel/py-flit-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
+
 USES=		python:3.7+
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	pep517 autoplist pytest
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	simlist
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
-do-test:
+post-test:
 	@${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/test.py
 
 .include <bsd.port.mk>
diff --git a/hebrew/py-pyluach/distinfo b/hebrew/py-pyluach/distinfo
index a95f7296eeea..a886056596f1 100644
--- a/hebrew/py-pyluach/distinfo
+++ b/hebrew/py-pyluach/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672004952
-SHA256 (pyluach-2.0.2.tar.gz) = 97894311f1b0d59f5fcab1d12147f8049bce315915d8dcd806bfbf41c94b50cf
-SIZE (pyluach-2.0.2.tar.gz) = 21562
+TIMESTAMP = 1677739691
+SHA256 (simlist-pyluach-v2.2.0_GH0.tar.gz) = 0fecc6311237b9decf22f7adf6f0dd002347e3fa1f10e6061ffa22d521386e3f
+SIZE (simlist-pyluach-v2.2.0_GH0.tar.gz) = 35564