diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile
index 3ba0cf780865..c49502791281 100644
--- a/devel/py-shapely/Makefile
+++ b/devel/py-shapely/Makefile
@@ -1,25 +1,28 @@
 PORTNAME=	shapely
-PORTVERSION=	1.8.5
-PORTREVISION=	2
+PORTVERSION=	2.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Shapely-${PORTVERSION}
 
-MAINTAINER=	wen@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python Package for Manipulation 2D Geospatial Geometry
-WWW=		https://pypi.org/project/shapely/
+WWW=		https://shapely.readthedocs.io/en/stable/ \
+		https://github.com/shapely/shapely
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.25,1<3,1:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libgeos_c.so:graphics/geos
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.21,1:math/py-numpy@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent cython pep517 pytest
 
-NO_ARCH=	yes
-
-do-test:
-	@cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/devel/py-shapely/distinfo b/devel/py-shapely/distinfo
index 169c5ba705b1..6cb10d7790d4 100644
--- a/devel/py-shapely/distinfo
+++ b/devel/py-shapely/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667913652
-SHA256 (Shapely-1.8.5.tar.gz) = e82b6d60ecfb124120c88fe106a478596bbeab142116d7e7f64a364dac902a92
-SIZE (Shapely-1.8.5.tar.gz) = 200741
+TIMESTAMP = 1752266344
+SHA256 (shapely-2.1.1.tar.gz) = 500621967f2ffe9642454808009044c21e5b35db89ce69f8a2042c2ffd0e2772
+SIZE (shapely-2.1.1.tar.gz) = 315422