diff --git a/devel/py-pycadf/Makefile b/devel/py-pycadf/Makefile
index c0df2377dcae..0663d432da19 100644
--- a/devel/py-pycadf/Makefile
+++ b/devel/py-pycadf/Makefile
@@ -1,42 +1,37 @@
 PORTNAME=	pycadf
-PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTVERSION=	4.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CADF Library
 WWW=		https://docs.openstack.org/pycadf/latest/ \
 		https://github.com/openstack/pycadf
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.config>=5.2.0:devel/py-oslo.config@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oslo.serialization>=2.18.0:devel/py-oslo.serialization@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytz>=2013.6,1:devel/py-pytz@${PY_FLAVOR}
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	openstack
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^data_files|no_&|' ${WRKSRC}/setup.cfg
-
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for service in ceilometer cinder glance neutron nova swift trove
 	${INSTALL_DATA} ${WRKSRC}/etc/pycadf/${service}_api_audit_map.conf ${STAGEDIR}${ETCDIR}/${service}_api_audit_map.conf.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/py-pycadf/distinfo b/devel/py-pycadf/distinfo
index 5334c9cdfe4e..8bc92c1393fb 100644
--- a/devel/py-pycadf/distinfo
+++ b/devel/py-pycadf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599653882
-SHA256 (pycadf-3.1.1.tar.gz) = 2be491143d21fa3dd1f842ce8dd4973e95f580893887960faa5c11a6190081e8
-SIZE (pycadf-3.1.1.tar.gz) = 250143
+TIMESTAMP = 1731679290
+SHA256 (pycadf-4.0.0.tar.gz) = 28cfcb7a4f600c656729d5c0f45d0e1a4b2fec27132e1b0300a95069e11eff79
+SIZE (pycadf-4.0.0.tar.gz) = 252647
diff --git a/devel/py-pycadf/files/patch-setup.cfg b/devel/py-pycadf/files/patch-setup.cfg
new file mode 100644
index 000000000000..42024b3d7273
--- /dev/null
+++ b/devel/py-pycadf/files/patch-setup.cfg
@@ -0,0 +1,18 @@
+--- setup.cfg.orig	2024-11-06 10:18:06 UTC
++++ setup.cfg
+@@ -25,15 +25,6 @@ packages = 
+ [files]
+ packages = 
+ 	pycadf
+-data_files = 
+-	etc/pycadf =
+-	etc/pycadf/cinder_api_audit_map.conf
+-	etc/pycadf/glance_api_audit_map.conf
+-	etc/pycadf/neutron_api_audit_map.conf
+-	etc/pycadf/nova_api_audit_map.conf
+-	etc/pycadf/trove_api_audit_map.conf
+-	etc/pycadf/ceilometer_api_audit_map.conf
+-	etc/pycadf/swift_api_audit_map.conf
+ 
+ [egg_info]
+ tag_build =