diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile
index 0dd393f3465e..ec3938eb3e32 100644
--- a/devel/py-pbr/Makefile
+++ b/devel/py-pbr/Makefile
@@ -1,22 +1,22 @@
 PORTNAME=	pbr
-PORTVERSION=	6.1.0
+PORTVERSION=	6.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python Build Reasonableness
 WWW=		https://github.com/openstack-dev/pbr
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pbr/distinfo b/devel/py-pbr/distinfo
index 0d695f77fc66..09babf8e3899 100644
--- a/devel/py-pbr/distinfo
+++ b/devel/py-pbr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1725559791
-SHA256 (pbr-6.1.0.tar.gz) = 788183e382e3d1d7707db08978239965e8b9e4e5ed42669bf4758186734d5f24
-SIZE (pbr-6.1.0.tar.gz) = 124032
+TIMESTAMP = 1738982840
+SHA256 (pbr-6.1.1.tar.gz) = 93ea72ce6989eb2eed99d0f75721474f69ad88128afdef5ac377eb797c4bf76b
+SIZE (pbr-6.1.1.tar.gz) = 125702
diff --git a/devel/py-pbr/files/patch-pyproject.toml b/devel/py-pbr/files/patch-pyproject.toml
new file mode 100644
index 000000000000..14f4e7429fea
--- /dev/null
+++ b/devel/py-pbr/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2025-02-04 14:24:43 UTC
++++ pyproject.toml
+@@ -1,7 +1,7 @@ requires = [
+ [build-system]
+ requires = [
+   # Includes pep660 support in setuptools
+-  "setuptools>=64.0.0;python_version>='3.7'",
++  "setuptools>=61.0.0;python_version>='3.7'",
+   # Fallback to whatever we can get otherwise.
+   # Note this is not something projects should typically
+   # need. PBR attempts to support a wide range of python