diff --git a/devel/py-cmd2/Makefile b/devel/py-cmd2/Makefile
index 825a5bd79068..8bd3ad7b5012 100644
--- a/devel/py-cmd2/Makefile
+++ b/devel/py-cmd2/Makefile
@@ -1,27 +1,25 @@
 PORTNAME=	cmd2
-PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTVERSION=	2.5.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Build interactive command line applications in Python
 WWW=		https://github.com/python-cmd2/cmd2
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=16.3.0:devel/py-attrs@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyperclip>=1.6:devel/py-pyperclip@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.7:devel/py-wcwidth@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyperclip>=0:devel/py-pyperclip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-cmd2/distinfo b/devel/py-cmd2/distinfo
index 574bab38e324..7d9d510018af 100644
--- a/devel/py-cmd2/distinfo
+++ b/devel/py-cmd2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675190995
-SHA256 (cmd2-2.4.3.tar.gz) = 71873c11f72bd19e2b1db578214716f0d4f7c8fa250093c601265a9a717dee52
-SIZE (cmd2-2.4.3.tar.gz) = 678661
+TIMESTAMP = 1729926987
+SHA256 (cmd2-2.5.0.tar.gz) = 36292d144e5fd62549b50e94e5f36514557fb92e615155ac28763ea4bc13b954
+SIZE (cmd2-2.5.0.tar.gz) = 688531
diff --git a/devel/py-cmd2/files/patch-pyproject.toml b/devel/py-cmd2/files/patch-pyproject.toml
new file mode 100644
index 000000000000..fe055c6d6c68
--- /dev/null
+++ b/devel/py-cmd2/files/patch-pyproject.toml
@@ -0,0 +1,9 @@
+--- pyproject.toml.orig	2024-10-24 02:28:16 UTC
++++ pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["build", "setuptools>=64", "setuptools-scm>=8"]
++requires = ["setuptools>=61", "setuptools-scm>=8"]
+ build-backend = "setuptools.build_meta"
+ 
+ [tool.doc8]