diff --git a/misc/py-einops/Makefile b/misc/py-einops/Makefile
index de10b79fd251..7f5bedd89d09 100644
--- a/misc/py-einops/Makefile
+++ b/misc/py-einops/Makefile
@@ -1,23 +1,35 @@
 PORTNAME=	einops
+DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.1
 CATEGORIES=	misc # machine-learning
-MASTER_SITES=	PYPI
+#MASTER_SITES=	PYPI # some test files are missing in the PYPI tarball
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	New flavour of deep learning operations
 WWW=		https://einops.rocks/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=1.10.0:devel/py-hatchling@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	pep517 autoplist pytest # 1 test fails because of missing pytorch
+USE_PYTHON=	pep517 autoplist pytest # 1 test fails because of some pytorch issues, see https://github.com/arogozhnikov/einops/issues/269
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	arogozhnikov
 
 NO_ARCH=	yes
 
+BINARY_ALIAS=	python=${PYTHON_CMD}
+
+TEST_ENV=	${MAKE_ENV} EINOPS_TEST_BACKENDS="numpy,torch"
+
+do-test-via-script:
+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} test.py numpy pytorch
+
 .include <bsd.port.mk>
diff --git a/misc/py-einops/distinfo b/misc/py-einops/distinfo
index 823c2915f4de..f569af104352 100644
--- a/misc/py-einops/distinfo
+++ b/misc/py-einops/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687408166
-SHA256 (einops-0.6.1.tar.gz) = f95f8d00f4ded90dbc4b19b6f98b177332614b0357dde66997f3ae5d474dc8c8
-SIZE (einops-0.6.1.tar.gz) = 55848
+TIMESTAMP = 1689062241
+SHA256 (arogozhnikov-einops-v0.6.1_GH0.tar.gz) = 693b2ccf131b4959b8f1487f4aef653e2fb7a00056a85137559aa2f2e02effd0
+SIZE (arogozhnikov-einops-v0.6.1_GH0.tar.gz) = 380481