diff --git a/math/py-Pyomo/Makefile b/math/py-Pyomo/Makefile
index 3325a049d4d3..519c542adc2b 100644
--- a/math/py-Pyomo/Makefile
+++ b/math/py-Pyomo/Makefile
@@ -1,19 +1,28 @@
 PORTNAME=	Pyomo
-DISTVERSION=	6.4.1
+DISTVERSION=	6.4.2
 CATEGORIES=	math python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python Optimization Modeling Objects
 WWW=		https://github.com/Pyomo/pyomo
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-parallel>0:devel/py-pytest-parallel@${PY_FLAVOR}
 
 USES=		python:3.6+
-USE_PYTHON=	distutils cython concurrent autoplist
+USE_PYTHON=	distutils cython concurrent autoplist pytest # 1 test fails, see https://github.com/Pyomo/pyomo/issues/2547
+
+USE_GITHUB=	yes
+GH_PROJECT=	pyomo
+
+post-install:
+	@${STRIP_CMD} $$(${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so")
 
 .include <bsd.port.mk>
diff --git a/math/py-Pyomo/distinfo b/math/py-Pyomo/distinfo
index 3eaedb6fa62b..89524a0fe12c 100644
--- a/math/py-Pyomo/distinfo
+++ b/math/py-Pyomo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652587739
-SHA256 (Pyomo-6.4.1.tar.gz) = a636a3a1c8314b8be85899cb6fac5d6a9a78fc75c6d58b74d3ec106ae5ed8f59
-SIZE (Pyomo-6.4.1.tar.gz) = 2049610
+TIMESTAMP = 1664132994
+SHA256 (Pyomo-pyomo-6.4.2_GH0.tar.gz) = f0af50ca40f19a1522c00531384ca21dcb0c2bcb2bcbc05c381a292ed23796e4
+SIZE (Pyomo-pyomo-6.4.2_GH0.tar.gz) = 12377206